Fix labels for service account

Signed-off-by: QuentinBisson <quentin@giantswarm.io>
prometheus-community · Aug 22, 2022 · 80eb9f9 · 80eb9f9
1 parent 3911547
commit 80eb9f9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/charts/prometheus-node-exporter/templates/endpoints.yaml b/charts/prometheus-node-exporter/templates/endpoints.yaml
@@ -4,8 +4,7 @@ kind: Endpoints
 metadata:
   name: {{ template "prometheus-node-exporter.fullname" . }}
   namespace: {{ template "prometheus-node-exporter.namespace" . }}
-  labels:
-{{ include "prometheus-node-exporter.labels" . | indent 4 }}
+  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
 subsets:
   - addresses:
       {{- range .Values.endpoints }}

diff --git a/charts/prometheus-node-exporter/templates/service.yaml b/charts/prometheus-node-exporter/templates/service.yaml
@@ -3,11 +3,11 @@ kind: Service
 metadata:
   name: {{ template "prometheus-node-exporter.fullname" . }}
   namespace: {{ template "prometheus-node-exporter.namespace" . }}
+  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
 {{- if .Values.service.annotations }}
   annotations:
 {{ toYaml .Values.service.annotations | indent 4 }}
 {{- end }}
-  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:

diff --git a/charts/prometheus-node-exporter/templates/serviceaccount.yaml b/charts/prometheus-node-exporter/templates/serviceaccount.yaml
@@ -5,11 +5,7 @@ kind: ServiceAccount
 metadata:
   name: {{ template "prometheus-node-exporter.serviceAccountName" . }}
   namespace: {{ template "prometheus-node-exporter.namespace" . }}
-  labels:
-    app: {{ template "prometheus-node-exporter.name" . }}
-    chart: {{ template "prometheus-node-exporter.chart" . }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+  labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }}
   annotations:
 {{ toYaml .Values.serviceAccount.annotations | indent 4 }}
 imagePullSecrets: