[bitnami/kube-state-metrics] Common labels and annotations (#6864)

* [bitnami/kube-state-metrics] Add commonLabels field

* [bitnami/kube-state-metrics] Add commonAnnotations field

* [bitnami/kube-state-metrics] Update chart version

* [bitnami/kube-state-metrics] Remove global.labels from README

bitnami/kube-state-metrics/Chart.yaml

@@ -23,4 +23,4 @@ name: kube-state-metrics
 sources:
   - https://github.com/bitnami/bitnami-docker-kube-state-metrics
   - https://github.com/kubernetes/kube-state-metrics
-version: 2.0.2
+version: 2.1.0

bitnami/kube-state-metrics/README.md

@@ -55,9 +55,10 @@ The following table lists the configurable parameters of the kube-state-metrics
 | `global.imageRegistry`                          | Global Docker image registry                                                                                  | `nil`                                                      |
 | `global.imagePullSecrets`                       | Global Docker registry secret names as an array                                                               | `[]` (does not add image pull secrets to deployed pods)    |
 | `global.storageClass`                           | Global storage class for dynamic provisioning                                                                 | `nil`                                                      |
-| `global.labels`                                 | Additional labels to apply to all resources                                                                   | `{}`                                                       |
 | `nameOverride`                                  | String to partially override `kube-state-metrics.name` template with a string (will prepend the release name) | `nil`                                                      |
 | `fullnameOverride`                              | String to fully override `kube-state-metrics.fullname` template with a string                                 | `nil`                                                      |
+| `commonLabels`                                  | Labels to add to all deployed objects                                                                         | `{}`                                                       |
+| `commonAnnotations`                             | Annotations to add to all deployed objects                                                                    | `{}`                                                       |
 | `rbac.create`                                   | Whether to create & use RBAC resources or not                                                                 | `true`                                                     |
 | `rbac.apiVersion`                               | Version of the RBAC API                                                                                       | `v1beta1`                                                  |
 | `rbac.pspEnabled`                               | PodSecurityPolicy                                                                                             | `true`                                                     |

bitnami/kube-state-metrics/templates/clusterrole.yaml

@@ -4,6 +4,12 @@ kind: ClusterRole
 metadata:
   name: {{ template "common.names.fullname" . }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 rules:
   {{- if .Values.kubeResources.certificatesigningrequests }}
   - apiGroups: ["certificates.k8s.io"]

bitnami/kube-state-metrics/templates/clusterrolebinding.yaml

@@ -4,6 +4,12 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "common.names.fullname" . }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

bitnami/kube-state-metrics/templates/deployment.yaml

@@ -4,6 +4,12 @@ metadata:
   name: {{ template "common.names.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
@@ -12,10 +18,19 @@ spec:
   minReadySeconds: {{ .Values.minReadySeconds }}
   template:
     metadata:
+      {{- if or .Values.podAnnotations .Values.commonAnnotations }}
+      annotations:
+      {{- if .Values.commonAnnotations }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }}
+      {{- end }}
       {{- if .Values.podAnnotations }}
-      annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
+      {{- end }}
       {{- end }}
       labels: {{- include "common.labels.standard" . | nindent 8 }}
+        {{- if .Values.commonLabels }}
+        {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
+        {{- end }}
         {{- if .Values.podLabels }}
         {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}

bitnami/kube-state-metrics/templates/psp-clusterrole.yaml

@@ -4,6 +4,12 @@ apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
   name: {{ template "common.names.fullname" . }}-psp
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 rules:
   - apiGroups: ['extensions']
     resources: ['podsecuritypolicies']

bitnami/kube-state-metrics/templates/psp-clusterrolebinding.yaml

@@ -4,6 +4,12 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "common.names.fullname" . }}-psp
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

bitnami/kube-state-metrics/templates/psp.yaml

@@ -4,6 +4,12 @@ kind: PodSecurityPolicy
 metadata:
   name: {{ template "common.names.fullname" . }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
   privileged: false
   volumes:

bitnami/kube-state-metrics/templates/service.yaml

@@ -7,10 +7,16 @@ metadata:
     {{- if not .Values.serviceMonitor.enabled }}
     prometheus.io/scrape: "true"
     {{- end }}
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
     {{- if .Values.service.annotations }}
     {{- include "common.tplvalues.render" (dict "value" .Values.service.annotations "context" $) | nindent 4 }}
     {{- end }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
     {{- if .Values.service.labels }}
     {{- toYaml .Values.service.labels | nindent 4 }}
     {{- end }}

bitnami/kube-state-metrics/templates/serviceaccount.yaml

@@ -5,4 +5,10 @@ metadata:
   name: {{ template "kube-state-metrics.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 {{- end }}

bitnami/kube-state-metrics/templates/servicemonitor.yaml

@@ -9,9 +9,15 @@ metadata:
   namespace: {{ .Release.Namespace }}
   {{- end }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
     {{- range $key, $value := .Values.serviceMonitor.selector }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
   {{- if .Values.serviceMonitor.jobLabel }}
   jobLabel: {{ .Values.serviceMonitor.jobLabel }}

bitnami/kube-state-metrics/values.yaml

@@ -8,11 +8,6 @@ global:
   #   - myRegistryKeySecretName
   # storageClass: myStorageClass
 
-  ## Additional labels to apply to all resources
-  ##
-  labels: {}
-  #   foo: bar
-
 ## String to partially override kube-state-metrics.fullname template (will maintain the release name)
 ##
 # nameOverride:
@@ -21,6 +16,14 @@ global:
 ##
 # fullnameOverride:
 
+## Add labels to all the deployed resources
+##
+commonLabels: {}
+
+## Add annotations to all the deployed resources
+##
+commonAnnotations: {}
+
 ## Deployment pod host aliases
 ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
 ##