add support for chart labels to exporters (#4589)

Co-authored-by: Etienne Barbier <etienne.barbier@atos.net>

bitnami/kube-prometheus/templates/exporters/core-dns/service.yaml

@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-coredns
   namespace: {{ .Values.coreDns.namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-coredns
 spec:
   clusterIP: None

bitnami/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml

@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-coredns
   namespace: {{ .Release.Namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-coredns
 spec:
   jobLabel: k8s-app

bitnami/kube-prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml

@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-apiserver
   namespace: {{ .Release.Namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: apiserver
 spec:
   jobLabel: component

bitnami/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml

@@ -4,7 +4,7 @@ kind: Endpoints
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager
   namespace: {{ .Values.kubeControllerManager.namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: kube-controller-manager
 subsets:
   - addresses:

bitnami/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml

@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager
   namespace: {{ .Values.kubeControllerManager.namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager
 spec:
   clusterIP: None

bitnami/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml

@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager
   namespace: {{ .Release.Namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager
 spec:
   jobLabel: component

bitnami/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml

@@ -4,7 +4,7 @@ kind: Endpoints
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-kube-proxy
   namespace: {{ .Values.kubeProxy.namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: kube-proxy
 subsets:
   - addresses:

bitnami/kube-prometheus/templates/exporters/kube-proxy/service.yaml

@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-kube-proxy
   namespace: {{ .Values.kubeProxy.namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: kube-proxy
 spec:
   clusterIP: None

bitnami/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml

@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-kube-proxy
   namespace: {{ .Release.Namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: kube-proxy
 spec:
   jobLabel: k8s-app

bitnami/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml

@@ -4,7 +4,7 @@ kind: Endpoints
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler
   namespace: {{ .Values.kubeScheduler.namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: kube-scheduler
 subsets:
   - addresses:

bitnami/kube-prometheus/templates/exporters/kube-scheduler/service.yaml

@@ -4,7 +4,7 @@ kind: Service
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler
   namespace: {{ .Values.kubeScheduler.namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-kube-scheduler
 spec:
   clusterIP: None

bitnami/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml

@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler
   namespace: {{ .Release.Namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-kube-scheduler
 spec:
   jobLabel: component

bitnami/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml

@@ -4,7 +4,7 @@ kind: ServiceMonitor
 metadata:
   name: {{ template "kube-prometheus.fullname" . }}-kubelet
   namespace: {{ .Release.Namespace }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  labels: {{- include "kube-prometheus.labels" . | nindent 4 }}
     app.kubernetes.io/component: kubelet
 spec:
   jobLabel: k8s-app