From 02137aa5b64da3460fbca80ea63569248989088d Mon Sep 17 00:00:00 2001
From: Etienne Barbier <barbier.dev@gmail.com>
Date: Thu, 3 Dec 2020 16:57:53 +0100
Subject: [PATCH] add support for chart labels to exporters (#4589)

Co-authored-by: Etienne Barbier <etienne.barbier@atos.net>
---
 .../kube-prometheus/templates/exporters/core-dns/service.yaml   | 2 +-
 .../templates/exporters/core-dns/servicemonitor.yaml            | 2 +-
 .../templates/exporters/kube-apiserver/servicemonitor.yaml      | 2 +-
 .../templates/exporters/kube-controller-manager/endpoints.yaml  | 2 +-
 .../templates/exporters/kube-controller-manager/service.yaml    | 2 +-
 .../exporters/kube-controller-manager/servicemonitor.yaml       | 2 +-
 .../templates/exporters/kube-proxy/endpoints.yaml               | 2 +-
 .../kube-prometheus/templates/exporters/kube-proxy/service.yaml | 2 +-
 .../templates/exporters/kube-proxy/servicemonitor.yaml          | 2 +-
 .../templates/exporters/kube-scheduler/endpoints.yaml           | 2 +-
 .../templates/exporters/kube-scheduler/service.yaml             | 2 +-
 .../templates/exporters/kube-scheduler/servicemonitor.yaml      | 2 +-
 .../templates/exporters/kubelet/servicemonitor.yaml             | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bitnami/kube-prometheus/templates/exporters/core-dns/service.yaml b/bitnami/kube-prometheus/templates/exporters/core-dns/service.yaml
index 71b5df159..359c945de 100644
--- a/bitnami/kube-prometheus/templates/exporters/core-dns/service.yaml
+++ b/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
diff --git a/bitnami/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml
index 9a42e0d9e..b75a7ab46 100644
--- a/bitnami/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml
+++ b/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
diff --git a/bitnami/kube-prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml
index 2808097fa..31d2af289 100644
--- a/bitnami/kube-prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml
+++ b/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
diff --git a/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml b/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml
index 288aa1320..13aa60ebf 100644
--- a/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml
+++ b/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:
diff --git a/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml b/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml
index 50a40ca1e..6a4553598 100644
--- a/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml
+++ b/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
diff --git a/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml
index cb8d9da2b..3f4a1abaf 100644
--- a/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml
+++ b/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
diff --git a/bitnami/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml b/bitnami/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml
index cb3953fd4..4d21cf7b7 100644
--- a/bitnami/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml
+++ b/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:
diff --git a/bitnami/kube-prometheus/templates/exporters/kube-proxy/service.yaml b/bitnami/kube-prometheus/templates/exporters/kube-proxy/service.yaml
index c06a89dff..1b3f5b8df 100644
--- a/bitnami/kube-prometheus/templates/exporters/kube-proxy/service.yaml
+++ b/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
diff --git a/bitnami/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml
index 15b14076b..0c81dcabc 100644
--- a/bitnami/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml
+++ b/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
diff --git a/bitnami/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml b/bitnami/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml
index d59d8e739..dde3d8b91 100644
--- a/bitnami/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml
+++ b/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:
diff --git a/bitnami/kube-prometheus/templates/exporters/kube-scheduler/service.yaml b/bitnami/kube-prometheus/templates/exporters/kube-scheduler/service.yaml
index 7dfb878a5..aad5969f5 100644
--- a/bitnami/kube-prometheus/templates/exporters/kube-scheduler/service.yaml
+++ b/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
diff --git a/bitnami/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml
index f343f4cf4..e844a3c62 100644
--- a/bitnami/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml
+++ b/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
diff --git a/bitnami/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml
index 54f93778f..be5f9a90a 100644
--- a/bitnami/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml
+++ b/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