feat: add full support for label and annotation handling in all resou…

…rces (#9490)
kubernetes · Oct 4, 2024 · 6c9cfce · 6c9cfce
1 parent 6425ac1
commit 6c9cfce
Show file tree

Hide file tree

Showing 28 changed files with 143 additions and 65 deletions.
diff --git a/charts/kubernetes-dashboard/Chart.yaml b/charts/kubernetes-dashboard/Chart.yaml
@@ -14,7 +14,7 @@
 
 apiVersion: v2
 name: kubernetes-dashboard
-version: 7.6.1
+version: 7.7.0
 description: General-purpose web UI for Kubernetes clusters
 keywords:
   - kubernetes

diff --git a/charts/kubernetes-dashboard/templates/_helpers.tpl b/charts/kubernetes-dashboard/templates/_helpers.tpl
@@ -53,6 +53,9 @@ helm.sh/chart: {{ include "kubernetes-dashboard.chart" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: {{ include "kubernetes-dashboard.name" . }}
+{{- with .Values.app.labels }}
+{{- toYaml . }}
+{{- end }}
 {{- end -}}
 
 {{/*
@@ -63,6 +66,15 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ include "kubernetes-dashboard.name" . }}
 {{- end -}}
 
+{{/*
+Common annotations
+*/}}
+{{- define "kubernetes-dashboard.annotations" -}}
+{{- with .Values.app.annotations }}
+{{- toYaml . }}
+{{- end }}
+{{- end -}}
+
 {{- define "kubernetes-dashboard.app.csrf.secret.name" -}}
 {{- printf "%s-%s" ( include "kubernetes-dashboard.fullname" . ) "csrf"}}
 {{- end -}}

diff --git a/charts/kubernetes-dashboard/templates/_tplvalues.tpl b/charts/kubernetes-dashboard/templates/_tplvalues.tpl
diff --git a/charts/kubernetes-dashboard/templates/config/gateway.yaml b/charts/kubernetes-dashboard/templates/config/gateway.yaml
@@ -19,6 +19,8 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
   name: {{ .Values.kong.dblessConfig.configMap }}
 data:
   kong.yml: |

diff --git a/charts/kubernetes-dashboard/templates/config/settings.yaml b/charts/kubernetes-dashboard/templates/config/settings.yaml
@@ -19,6 +19,8 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
   name: {{ template "kubernetes-dashboard.web.configMap.settings.name" . }}
 data:
 {{- with .Values.app.settings.global }}

diff --git a/charts/kubernetes-dashboard/templates/deployments/api.yaml b/charts/kubernetes-dashboard/templates/deployments/api.yaml
@@ -18,14 +18,15 @@ metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
     {{- with .Values.api.labels }}
-    {{ toYaml . | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
     app.kubernetes.io/name: {{ template "kubernetes-dashboard.name" . }}-{{ .Values.api.role }}
     app.kubernetes.io/version: {{ .Values.api.image.tag }}
     app.kubernetes.io/component: {{ .Values.api.role }}
   annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
     {{- with .Values.api.annotations }}
-    {{ toYaml . | nindent 8 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.api.role }}
 spec:

diff --git a/charts/kubernetes-dashboard/templates/deployments/auth.yaml b/charts/kubernetes-dashboard/templates/deployments/auth.yaml
@@ -21,14 +21,15 @@ metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
     {{- with .Values.auth.labels }}
-    {{ toYaml . | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
     app.kubernetes.io/name: {{ template "kubernetes-dashboard.name" . }}-{{ .Values.auth.role }}
     app.kubernetes.io/version: {{ .Values.api.image.tag }}
     app.kubernetes.io/component: {{ .Values.auth.role }}
   annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
     {{- with .Values.auth.annotations }}
-    {{ toYaml . | nindent 8 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.auth.role }}
 spec:

diff --git a/charts/kubernetes-dashboard/templates/deployments/metrics-scraper.yaml b/charts/kubernetes-dashboard/templates/deployments/metrics-scraper.yaml
@@ -20,14 +20,15 @@ metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
     {{- with .Values.metricsScraper.labels }}
-    {{ toYaml . | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
     app.kubernetes.io/name: {{ template "kubernetes-dashboard.name" . }}-{{ .Values.metricsScraper.role }}
     app.kubernetes.io/version: {{ .Values.metricsScraper.image.tag }}
     app.kubernetes.io/component: {{ .Values.metricsScraper.role }}
   annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
     {{- with .Values.metricsScraper.annotations }}
-    {{ toYaml . | nindent 8 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
   name: {{ template "kubernetes-dashboard.metrics-scraper.name" . }}
 spec:

diff --git a/charts/kubernetes-dashboard/templates/deployments/web.yaml b/charts/kubernetes-dashboard/templates/deployments/web.yaml
@@ -20,14 +20,15 @@ metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
     {{- with .Values.web.labels }}
-    {{ toYaml . | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
     app.kubernetes.io/name: {{ template "kubernetes-dashboard.name" . }}-{{ .Values.web.role }}
     app.kubernetes.io/version: {{ .Values.web.image.tag }}
     app.kubernetes.io/component: {{ .Values.web.role }}
   annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
     {{- with .Values.web.annotations }}
-    {{ toYaml . | nindent 8 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.web.role }}
 spec:

diff --git a/charts/kubernetes-dashboard/templates/extras/servicemonitor.yaml b/charts/kubernetes-dashboard/templates/extras/servicemonitor.yaml
@@ -18,17 +18,15 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "kubernetes-dashboard.fullname" . }}
   labels:
-  {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
-  {{- if .Values.app.labels }}
-  {{- include "common.tplvalues.render" ( dict "value" .Values.app.labels "context" $ ) | nindent 4 }}
-  {{- end }}
-  {{- if .Values.extras.serviceMonitor.labels }}
-  {{- include "common.tplvalues.render" ( dict "value" .Values.extras.serviceMonitor.labels "context" $ ) | nindent 4 }}
-  {{- end }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- with .Values.extras.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
-  {{- if .Values.extras.serviceMonitor.annotations }}
-  {{- include "common.tplvalues.render" ( dict "value" .Values.extras.serviceMonitor.annotations "context" $ ) | nindent 4 }}
-  {{- end }}
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
+    {{- with .Values.extras.serviceMonitor.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   endpoints:
     - port: https

diff --git a/charts/kubernetes-dashboard/templates/networking/ingress.yaml b/charts/kubernetes-dashboard/templates/networking/ingress.yaml
@@ -24,6 +24,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
   annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
     {{- if eq .Values.app.ingress.issuer.scope "default" }}
     cert-manager.io/issuer: {{ .Values.app.ingress.issuer.name }}
     {{- end }}

diff --git a/charts/kubernetes-dashboard/templates/rbac/api/role.yaml b/charts/kubernetes-dashboard/templates/rbac/api/role.yaml
@@ -19,6 +19,14 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- with .Values.api.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
+    {{- with .Values.api.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.api.role }}
 rules:
     # Allow Dashboard API to get metrics from metrics-scraper.

diff --git a/charts/kubernetes-dashboard/templates/rbac/api/rolebinding.yaml b/charts/kubernetes-dashboard/templates/rbac/api/rolebinding.yaml
@@ -19,6 +19,14 @@ kind: RoleBinding
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- with .Values.api.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
+    {{- with .Values.api.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.api.role }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/charts/kubernetes-dashboard/templates/rbac/api/serviceaccount.yaml b/charts/kubernetes-dashboard/templates/rbac/api/serviceaccount.yaml
@@ -19,6 +19,14 @@ kind: ServiceAccount
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- with .Values.api.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
+    {{- with .Values.api.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.api.role }}
 
 {{- end -}}
diff --git a/charts/kubernetes-dashboard/templates/rbac/metrics-scraper/clusterrole.yaml b/charts/kubernetes-dashboard/templates/rbac/metrics-scraper/clusterrole.yaml
@@ -19,6 +19,14 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- with .Values.metricsScraper.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
+    {{- with .Values.metricsScraper.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.metricsScraper.role }}
 rules:
   # Allow Metrics Scraper to get metrics from the Metrics server

diff --git a/charts/kubernetes-dashboard/templates/rbac/metrics-scraper/clusterrolebinding.yaml b/charts/kubernetes-dashboard/templates/rbac/metrics-scraper/clusterrolebinding.yaml
@@ -19,6 +19,14 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- with .Values.metricsScraper.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
+    {{- with .Values.metricsScraper.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.metricsScraper.role }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/charts/kubernetes-dashboard/templates/rbac/metrics-scraper/serviceaccount.yaml b/charts/kubernetes-dashboard/templates/rbac/metrics-scraper/serviceaccount.yaml
@@ -19,6 +19,14 @@ kind: ServiceAccount
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- with .Values.metricsScraper.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
+    {{- with .Values.metricsScraper.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.metricsScraper.role }}
 
 {{- end -}}
diff --git a/charts/kubernetes-dashboard/templates/rbac/web/role.yaml b/charts/kubernetes-dashboard/templates/rbac/web/role.yaml
@@ -19,6 +19,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.web.role }}
 rules:
     # Allow Dashboard Web to get and update 'kubernetes-dashboard-settings' config map.

diff --git a/charts/kubernetes-dashboard/templates/rbac/web/rolebinding.yaml b/charts/kubernetes-dashboard/templates/rbac/web/rolebinding.yaml
@@ -19,6 +19,8 @@ kind: RoleBinding
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.web.role }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/charts/kubernetes-dashboard/templates/rbac/web/serviceaccount.yaml b/charts/kubernetes-dashboard/templates/rbac/web/serviceaccount.yaml
@@ -19,6 +19,8 @@ kind: ServiceAccount
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.web.role }}
 
 {{- end -}}
diff --git a/charts/kubernetes-dashboard/templates/secrets/csrf.yaml b/charts/kubernetes-dashboard/templates/secrets/csrf.yaml
@@ -17,6 +17,8 @@ kind: Secret
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
   name: {{ template "kubernetes-dashboard.app.csrf.secret.name" . }}
 data:
   {{ (include "kubernetes-dashboard.app.csrf.secret.value" . ) -}}
diff --git a/charts/kubernetes-dashboard/templates/security/networkpolicy.yaml b/charts/kubernetes-dashboard/templates/security/networkpolicy.yaml
@@ -16,16 +16,11 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: {{ template "kubernetes-dashboard.fullname" . }}
   labels:
-  {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
-  {{- if .Values.app.labels }}
-  {{- include "common.tplvalues.render" ( dict "value" .Values.app.labels "context" $ ) | nindent 4 }}
-  {{- end }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
   annotations:
-  {{- if .Values.app.annotations }}
-  {{- include "common.tplvalues.render" ( dict "value" .Values.app.annotations "context" $ ) | nindent 4 }}
-  {{- end }}
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
+  name: {{ template "kubernetes-dashboard.fullname" . }}
 spec:
   podSelector:
     matchLabels:

diff --git a/charts/kubernetes-dashboard/templates/security/pdb.yaml b/charts/kubernetes-dashboard/templates/security/pdb.yaml
@@ -17,14 +17,9 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   labels:
-  {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
-  {{- if .Values.app.labels }}
-  {{- include "common.tplvalues.render" ( dict "value" .Values.app.labels "context" $ ) | nindent 4 }}
-  {{- end }}
+    {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
   annotations:
-  {{- if .Values.app.annotations }}
-  {{- include "common.tplvalues.render" ( dict "value" .Values.app.annotations "context" $ ) | nindent 4 }}
-  {{- end }}
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
   name: {{ template "kubernetes-dashboard.fullname" . }}
 spec:
   selector:

diff --git a/charts/kubernetes-dashboard/templates/services/api.yaml b/charts/kubernetes-dashboard/templates/services/api.yaml
@@ -17,9 +17,17 @@ apiVersion: v1
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- with .Values.api.serviceLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
     app.kubernetes.io/name: {{ template "kubernetes-dashboard.name" . }}-{{ .Values.api.role }}
     app.kubernetes.io/version: {{ .Values.api.image.tag }}
     app.kubernetes.io/component: {{ .Values.api.role }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
+    {{- with .Values.api.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.api.role }}
 spec:
   ports:

diff --git a/charts/kubernetes-dashboard/templates/services/auth.yaml b/charts/kubernetes-dashboard/templates/services/auth.yaml
@@ -19,9 +19,17 @@ apiVersion: v1
 metadata:
   labels:
     {{- include "kubernetes-dashboard.labels" . | nindent 4 }}
+    {{- with .Values.auth.serviceLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
     app.kubernetes.io/name: {{ template "kubernetes-dashboard.name" . }}-{{ .Values.auth.role }}
     app.kubernetes.io/version: {{ .Values.auth.image.tag }}
     app.kubernetes.io/component: {{ .Values.auth.role }}
+  annotations:
+    {{- include "kubernetes-dashboard.annotations" . | nindent 4 }}
+    {{- with .Values.auth.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ template "kubernetes-dashboard.fullname" . }}-{{ .Values.auth.role }}
 spec:
   ports: