Merge "[COMMON] Add doc linting"

diff --git a/kubernetes/common/common/templates/_labels.tpl b/kubernetes/common/common/templates/_labels.tpl
index 6672762..da8f00f 100644 (file)
--- a/kubernetes/common/common/templates/_labels.tpl
+++ b/kubernetes/common/common/templates/_labels.tpl
@@ -30,7 +30,7 @@ app.kubernetes.io/instance: {{ include "common.release" $dot }}
 app.kubernetes.io/managed-by: {{ $dot.Release.Service }}
 {{ if .labels }}
 {{- include "common.tplValue" (dict "value" .labels "context" $dot) }}
-{{- end -}}
+{{- end }}
 {{- end -}}
 
 {{/*
@@ -41,14 +41,15 @@ The function takes several arguments (inside a dictionary):
 */}}
 {{- define "common.matchLabels" -}}
 {{- $dot := default . .dot -}}
-{{- if not .matchLabels.nameNoMatch -}}
+{{- $matchLabels := default (dict) .matchLabels -}}
+{{- if not $matchLabels.nameNoMatch -}}
 app.kubernetes.io/name: {{ include "common.name" $dot }}
 {{- end }}
 app.kubernetes.io/instance: {{ include "common.release" $dot }}
-{{ if .matchLabels }}
-{{$_ := unset .matchLabels "nameNoMatch"}}
-{{- include "common.tplValue" (dict "value" .matchLabels "context" $dot) }}
-{{- end -}}
+{{- if $matchLabels }}
+{{$_ := unset $matchLabels "nameNoMatch"}}
+{{- include "common.tplValue" (dict "value" $matchLabels "context" $dot) }}
+{{- end }}
 {{- end -}}
 
 {{/*
@@ -69,7 +70,7 @@ namespace: {{ include "common.namespace" $dot }}
 labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot ) | nindent 2 }}
 {{- if $annotations }}
 annotations:  {{- include "common.tplValue" (dict "value" $annotations "context" $dot) | nindent 2}}
-{{- end -}}
+{{- end }}
 {{- end -}}
 
 {{/*
@@ -94,7 +95,7 @@ matchLabels: {{- include "common.matchLabels" (dict "matchLabels" $matchLabels "
 {{- $dot := default . .dot -}}
 {{- $labels := default (dict) .labels -}}
 {{- if $dot.Values.podAnnotations }}
-annotations: {{- include "common.tplValue" (dict "value" $dot.Values.podAnnotations "context" $) | nindent 2 }}
+annotations: {{- include "common.tplValue" (dict "value" $dot.Values.podAnnotations "context" $dot) | nindent 2 }}
 {{- end }}
 labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent 2 }}
 name: {{ include "common.name" $dot }}

diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index df0e6b4..1be3e3b 100644 (file)
--- a/kubernetes/common/common/templates/_mariadb.tpl
+++ b/kubernetes/common/common/templates/_mariadb.tpl
@@ -44,6 +44,13 @@
   {{- printf "db-user-credentials" }}
 {{- end -}}
 
+{{/*
+  UID of mariadb backup credentials
+*/}}
+{{- define "common.mariadb.secret.backupCredentialsUID" -}}
+  {{- printf "db-backup-credentials" }}
+{{- end -}}
+
 {{/*
   Name of mariadb user credentials secret
 */}}

diff --git a/kubernetes/consul/charts/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml
similarity index 100%
rename from kubernetes/consul/charts/consul-server/Chart.yaml
rename to kubernetes/consul/components/consul-server/Chart.yaml

diff --git a/kubernetes/consul/charts/consul-server/requirements.yaml b/kubernetes/consul/components/consul-server/requirements.yaml
similarity index 100%
rename from kubernetes/consul/charts/consul-server/requirements.yaml
rename to kubernetes/consul/components/consul-server/requirements.yaml

diff --git a/kubernetes/consul/charts/consul-server/templates/NOTES.txt b/kubernetes/consul/components/consul-server/templates/NOTES.txt
similarity index 100%
rename from kubernetes/consul/charts/consul-server/templates/NOTES.txt
rename to kubernetes/consul/components/consul-server/templates/NOTES.txt

diff --git a/kubernetes/consul/charts/consul-server/templates/service.yaml b/kubernetes/consul/components/consul-server/templates/service.yaml
similarity index 100%
rename from kubernetes/consul/charts/consul-server/templates/service.yaml
rename to kubernetes/consul/components/consul-server/templates/service.yaml

diff --git a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml b/kubernetes/consul/components/consul-server/templates/statefulset.yaml
similarity index 100%
rename from kubernetes/consul/charts/consul-server/templates/statefulset.yaml
rename to kubernetes/consul/components/consul-server/templates/statefulset.yaml

diff --git a/kubernetes/consul/charts/consul-server/values.yaml b/kubernetes/consul/components/consul-server/values.yaml
similarity index 100%
rename from kubernetes/consul/charts/consul-server/values.yaml
rename to kubernetes/consul/components/consul-server/values.yaml

diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml
index 2161e6e..bde1c36 100644 (file)
--- a/kubernetes/consul/requirements.yaml
+++ b/kubernetes/consul/requirements.yaml
@@ -23,3 +23,7 @@ dependencies:
   - name: repositoryGenerator
     version: ~7.x-0
     repository: '@local'
+  - name: consul-server
+    version: ~7.x-0
+    repository: 'file://components/consul-server'
+    condition: cds-command-executor.enabled

diff --git a/kubernetes/msb/templates/serviceaccout.yaml b/kubernetes/msb/templates/serviceaccout.yaml
index ae18862..3248a0f 100644 (file)
--- a/kubernetes/msb/templates/serviceaccout.yaml
+++ b/kubernetes/msb/templates/serviceaccout.yaml
@@ -19,7 +19,7 @@ metadata:
   name: msb 
   namespace: {{ include "common.namespace" . }} 
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ include "common.namespace" . }}-msb-binding

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/values.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
index 0328610..b17f270 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
@@ -20,3 +20,9 @@ dependencies:
   - name: repositoryGenerator
     version: ~7.x-0
     repository: '@local'
+  - name: prometheus-alertmanager
+    version: ~7.x-0
+    repository: 'file://components/prometheus-alertmanager'
+  - name: prometheus-grafana
+    version: ~7.x-0
+    repository: 'file://components/prometheus-grafana'
\ No newline at end of file