Add _tplvalues.tpl and define commonLabels, podLabels, commonAnnotati…

…ons and podAnnotations attributes (#6638) * Update helm resources to enbale common bitnami usage Add dependency and update values add _tplvalues and remove dependencies * Update Chart.yaml bump version to 5.0.5 * add missing license
kubernetes · Dec 12, 2021 · 57ca4e1 · 57ca4e1
1 parent 870b069
commit 57ca4e1
Show file tree

Hide file tree

Showing 18 changed files with 219 additions and 78 deletions.
diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/Chart.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/Chart.yaml
@@ -14,22 +14,22 @@
 
 apiVersion: v2
 name: kubernetes-dashboard
-version: 5.0.4
+version: 5.0.5
 appVersion: 2.4.0
 description: General-purpose web UI for Kubernetes clusters
 keywords:
-- kubernetes
-- dashboard
+  - kubernetes
+  - dashboard
 home: https://github.com/kubernetes/dashboard
 sources:
-- https://github.com/kubernetes/dashboard
+  - https://github.com/kubernetes/dashboard
 maintainers:
-- name: desaintmartin
-  email: cdesaintmartin@wiremind.fr
+  - name: desaintmartin
+    email: cdesaintmartin@wiremind.fr
 icon: https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.svg
 kubeVersion: ">=1.19.0-0"
 dependencies:
-- name: metrics-server
-  version: 3.5.0
-  repository: https://kubernetes-sigs.github.io/metrics-server/
-  condition: metrics-server.enabled
+  - name: metrics-server
+    version: 3.5.0
+    repository: https://kubernetes-sigs.github.io/metrics-server/
+    condition: metrics-server.enabled
diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/_tplvalues.tpl b/aio/deploy/helm-chart/kubernetes-dashboard/templates/_tplvalues.tpl
@@ -0,0 +1,27 @@
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "common.tplvalues.render" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}
diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/clusterrole-metrics.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/templates/clusterrole-metrics.yaml
@@ -18,7 +18,14 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: "{{ template "kubernetes-dashboard.fullname" . }}-metrics"
   labels:
-{{ include "kubernetes-dashboard.labels" . | indent 4 }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
 rules:
   # Allow Metrics Scraper to get metrics from the Metrics server
   - apiGroups: ["metrics.k8s.io"]

diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/clusterrole-readonly.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/templates/clusterrole-readonly.yaml
@@ -18,7 +18,14 @@ kind: ClusterRole
 metadata:
   name: "{{ template "kubernetes-dashboard.fullname" . }}-readonly"
   labels:
-{{ include "kubernetes-dashboard.labels" . | indent 4 }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
 rules:
   - apiGroups:
       - ""

diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/clusterrolebinding-metrics.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/templates/clusterrolebinding-metrics.yaml
@@ -18,7 +18,14 @@ kind: ClusterRoleBinding
 metadata:
   name: "{{ template "kubernetes-dashboard.fullname" . }}-metrics"
   labels:
-{{ include "kubernetes-dashboard.labels" . | indent 4 }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/clusterrolebinding-readonly.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/templates/clusterrolebinding-readonly.yaml
@@ -18,7 +18,14 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "kubernetes-dashboard.fullname" . }}-readonly
   labels:
-{{ include "kubernetes-dashboard.labels" . | indent 4 }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/configmap.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/templates/configmap.yaml
@@ -16,7 +16,14 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
-{{ include "kubernetes-dashboard.labels" . | indent 4 }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
   name: kubernetes-dashboard-settings
 data:
 {{- with .Values.settings }}

diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/deployment.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/templates/deployment.yaml
@@ -16,16 +16,22 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "kubernetes-dashboard.fullname" . }}
-{{- with .Values.annotations }}
   annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
+    {{- with .Values.annotations }}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
   labels:
-{{ include "kubernetes-dashboard.labels" . | indent 4 }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
     app.kubernetes.io/component: kubernetes-dashboard
-{{- with .Values.labels }}
-{{ toYaml . | indent 4 }}
-{{- end }}
+    {{- with .Values.labels }}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   strategy:
@@ -35,24 +41,24 @@ spec:
     type: RollingUpdate
   selector:
     matchLabels:
-{{ include "kubernetes-dashboard.matchLabels" . | indent 6 }}
+{{ include "kubernetes-dashboard.matchLabels" . | nindent 6 }}
       app.kubernetes.io/component: kubernetes-dashboard
   template:
     metadata:
-{{- with .Values.podAnnotations }}
       annotations:
-{{ toYaml . | indent 8 }}
-{{- end }}
+        {{- if .Values.podAnnotations }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
+        {{- end }}
       labels:
-{{ include "kubernetes-dashboard.labels" . | indent 8 }}
+        {{- include "kubernetes-dashboard.labels" . | nindent 8 }}
         app.kubernetes.io/component: kubernetes-dashboard
-{{- with .Values.podLabels }}
-{{ toYaml . | indent 8 }}
-{{- end }}
+        {{- if .Values.podLabels }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
+        {{- end }}
     spec:
 {{- with .Values.securityContext }}
       securityContext:
-{{ toYaml . | indent 8 }}
+{{ toYaml . | nindent 8 }}
 {{- end }}
       serviceAccountName: {{ template "kubernetes-dashboard.serviceAccountName" . }}
       containers:
@@ -70,11 +76,11 @@ spec:
           - --metrics-provider=none
 {{- end }}
 {{- with .Values.extraArgs }}
-{{ toYaml . | indent 10 }}
+{{ toYaml . | nindent 10 }}
 {{- end }}
 {{- with .Values.extraEnv }}
         env:
-{{ toYaml . | indent 10 }}
+{{ toYaml . | nindent 10 }}
 {{- end }}
         ports:
 {{- if .Values.protocolHttp }}
@@ -93,7 +99,7 @@ spec:
         - mountPath: /tmp
           name: tmp-volume
 {{- with .Values.extraVolumeMounts }}
-{{ toYaml . | indent 8 }}
+{{ toYaml . | nindent 8 }}
 {{- end }}
         livenessProbe:
           httpGet:
@@ -110,19 +116,19 @@ spec:
           timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
 {{- with .Values.resources }}
         resources:
-{{ toYaml . | indent 10 }}
+{{ toYaml . | nindent 10 }}
 {{- end }}
 {{- with .Values.containerSecurityContext }}
         securityContext:
-{{ toYaml . | indent 10 }}
+{{ toYaml . | nindent 10 }}
 {{- end }}
 {{- if .Values.metricsScraper.enabled }}
       - name: dashboard-metrics-scraper
         image: "{{ .Values.metricsScraper.image.repository }}:{{ .Values.metricsScraper.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
 {{- with .Values.metricsScraper.args }}
         args:
-{{ toYaml . | indent 10 }}
+{{ toYaml . | nindent 10 }}
 {{- end }}
         ports:
           - containerPort: 8000
@@ -139,11 +145,11 @@ spec:
           name: tmp-volume
 {{- with .Values.metricsScraper.containerSecurityContext }}
         securityContext:
-{{ toYaml . | indent 10 }}
+{{ toYaml . | nindent 10 }}
 {{- end }}
 {{- with .Values.metricsScraper.resources }}
         resources:
-{{ toYaml . | indent 10 }}
+{{ toYaml . | nindent 10 }}
 {{- end }}
 {{- end }}
 {{- with .Values.image.pullSecrets }}
@@ -154,7 +160,7 @@ spec:
 {{- end }}
 {{- with .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml . | indent 8 }}
+{{ toYaml . | nindent 8 }}
 {{- end }}
 {{- with .Values.priorityClassName }}
       priorityClassName: "{{ . }}"
@@ -166,13 +172,13 @@ spec:
       - name: tmp-volume
         emptyDir: {}
 {{- with .Values.extraVolumes }}
-{{ toYaml . | indent 6 }}
+{{ toYaml . | nindent 6 }}
 {{- end }}
 {{- with .Values.tolerations }}
       tolerations:
-{{ toYaml . | indent 8 }}
+{{ toYaml . | nindent 8 }}
 {{- end }}
 {{- with .Values.affinity }}
       affinity:
-{{ toYaml . | indent 8 }}
+{{ toYaml . | nindent 8 }}
 {{- end }}
diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/ingress.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/templates/ingress.yaml
@@ -21,21 +21,26 @@ kind: Ingress
 metadata:
   name: {{ template "kubernetes-dashboard.fullname" . }}
   labels:
-{{ include "kubernetes-dashboard.labels" . | indent 4 }}
-  {{- range $key, $value := .Values.ingress.labels }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- range $key, $value := .Values.ingress.labels }}
     {{ $key }}: {{ $value | quote }}
-  {{- end }}
-
+    {{- end }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
   annotations:
-{{- if not .Values.protocolHttp }}
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
+    {{- if not .Values.protocolHttp }}
     # Add https backend protocol support for ingress-nginx
     nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
     # Add https backend protocol support for GKE
     service.alpha.kubernetes.io/app-protocols: '{"https":"HTTPS"}'
-{{- end }}
-{{- with .Values.ingress.annotations }}
-{{ toYaml . | indent 4 }}
-{{- end }}
+    {{- end }}
+    {{- with .Values.ingress.annotations }}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   {{- with .Values.ingress.className }}
   ingressClassName: {{ . | quote }}
@@ -47,7 +52,7 @@ spec:
       http:
         paths:
   {{- if len ($.Values.ingress.customPaths) }}
-  {{- "\n" }}{{ tpl (toYaml $.Values.ingress.customPaths | indent 10) $ }}
+  {{- "\n" }}{{ tpl (toYaml $.Values.ingress.customPaths | nindent 10) $ }}
   {{- else }}
   {{- range $p := $paths }}
           - path: {{ $p }}
@@ -64,7 +69,7 @@ spec:
     - http:
         paths:
   {{- if len ($.Values.ingress.customPaths) }}
-  {{- "\n" }}{{ tpl (toYaml $.Values.ingress.customPaths | indent 10) $ }}
+  {{- "\n" }}{{ tpl (toYaml $.Values.ingress.customPaths | nindent 10) $ }}
   {{- else }}
   {{- range $p := $paths }}
           - path: {{ $p }}
@@ -79,6 +84,6 @@ spec:
   {{- end -}}
   {{- if .Values.ingress.tls }}
   tls:
-{{ toYaml .Values.ingress.tls | indent 4 }}
+{{ toYaml .Values.ingress.tls | nindent 4 }}
   {{- end -}}
 {{- end -}}
diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/networkpolicy.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/templates/networkpolicy.yaml
@@ -22,10 +22,17 @@ metadata:
     chart: {{ template "kubernetes-dashboard.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
 spec:
   podSelector:
     matchLabels:
-{{ include "kubernetes-dashboard.matchLabels" . | indent 6 }}
+{{ include "kubernetes-dashboard.matchLabels" . | nindent 6 }}
   ingress:
   - ports:
 {{- if .Values.protocolHttp }}

diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/pdb.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/templates/pdb.yaml
@@ -17,7 +17,14 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   labels:
-{{ include "kubernetes-dashboard.labels" . | indent 4 }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}
 spec:
   {{- if .Values.podDisruptionBudget.minAvailable }}
@@ -28,5 +35,5 @@ spec:
   {{- end  }}
   selector:
     matchLabels:
-{{ include "kubernetes-dashboard.matchLabels" . | indent 6 }}
+{{ include "kubernetes-dashboard.matchLabels" . | nindent 6 }}
 {{- end -}}