[bitnami/kube-prometheus] Fix _helpers.tpl to take into account global.labels option (#3765)

bitnami/kube-prometheus/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.42.1
 description: kube-prometheus collects Kubernetes manifests to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
 name: kube-prometheus
-version: 2.1.0
+version: 2.1.1
 keywords:
   - prometheus
   - alertmanager

bitnami/kube-prometheus/templates/_helpers.tpl

@@ -59,11 +59,21 @@ If release name contains chart name it will be used as a full name.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Common Labels
+*/}}
+{{- define "kube-prometheus.labels" -}}
+{{ include "common.labels.standard" . }}
+{{- if .Values.global.labels }}
+{{ toYaml .Values.global.labels }}
+{{- end }}
+{{- end -}}
+
 {{/*
 Labels for operator
 */}}
 {{- define "kube-prometheus.operator.labels" -}}
-{{ include "common.labels.standard" . }}
+{{ include "kube-prometheus.labels" . }}
 app.kubernetes.io/component: operator
 {{- end -}}
 
@@ -71,7 +81,7 @@ app.kubernetes.io/component: operator
 Labels for prometheus
 */}}
 {{- define "kube-prometheus.prometheus.labels" -}}
-{{ include "common.labels.standard" . }}
+{{ include "kube-prometheus.labels" . }}
 app.kubernetes.io/component: prometheus
 {{- end -}}
 
@@ -79,7 +89,7 @@ app.kubernetes.io/component: prometheus
 Labels for alertmanager
 */}}
 {{- define "kube-prometheus.alertmanager.labels" -}}
-{{ include "common.labels.standard" . }}
+{{ include "kube-prometheus.labels" . }}
 app.kubernetes.io/component: alertmanager
 {{- end -}}