From 0f4948d51b3e0b1205cdfaef4f2824b61e030588 Mon Sep 17 00:00:00 2001
From: Erwan Miran <mirwan@users.noreply.github.com>
Date: Fri, 11 Jun 2021 09:45:57 +0200
Subject: [PATCH] [kube-state-metrics] Fix: Use serviceAccountName template
 helper where it should (#1063)

* Bump kube-state-metrics version to 3.2.1

Signed-off-by: Erwan Miran <mirwan666@gmail.com>

* [kube-state-metrics] Fix: Use serviceAccountName template helper where it should

Signed-off-by: Erwan Miran <mirwan666@gmail.com>
---
 charts/kube-state-metrics/Chart.yaml                            | 2 +-
 charts/kube-state-metrics/templates/clusterrolebinding.yaml     | 2 +-
 charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml | 2 +-
 charts/kube-state-metrics/templates/rolebinding.yaml            | 2 +-
 charts/kube-state-metrics/templates/serviceaccount.yaml         | 2 +-
 .../kube-state-metrics/templates/stsdiscovery-rolebinding.yaml  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml
index 59da8b5e..688f2621 100644
--- a/charts/kube-state-metrics/Chart.yaml
+++ b/charts/kube-state-metrics/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
 - prometheus
 - kubernetes
 type: application
-version: 3.2.0
+version: 3.2.1
 appVersion: 2.0.0
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:
diff --git a/charts/kube-state-metrics/templates/clusterrolebinding.yaml b/charts/kube-state-metrics/templates/clusterrolebinding.yaml
index af158c51..223c285b 100644
--- a/charts/kube-state-metrics/templates/clusterrolebinding.yaml
+++ b/charts/kube-state-metrics/templates/clusterrolebinding.yaml
@@ -18,6 +18,6 @@ roleRef:
 {{- end }}
 subjects:
 - kind: ServiceAccount
-  name: {{ template "kube-state-metrics.fullname" . }}
+  name: {{ template "kube-state-metrics.serviceAccountName" . }}
   namespace: {{ template "kube-state-metrics.namespace" . }}
 {{- end -}}
diff --git a/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml b/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml
index feb97f22..b96503f2 100644
--- a/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml
+++ b/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml
@@ -14,6 +14,6 @@ roleRef:
   name: psp-{{ template "kube-state-metrics.fullname" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ template "kube-state-metrics.fullname" . }}
+    name: {{ template "kube-state-metrics.serviceAccountName" . }}
     namespace: {{ template "kube-state-metrics.namespace" . }}
 {{- end }}
diff --git a/charts/kube-state-metrics/templates/rolebinding.yaml b/charts/kube-state-metrics/templates/rolebinding.yaml
index 72a1a2e9..6809e2bb 100644
--- a/charts/kube-state-metrics/templates/rolebinding.yaml
+++ b/charts/kube-state-metrics/templates/rolebinding.yaml
@@ -21,7 +21,7 @@ roleRef:
 {{- end }}
 subjects:
 - kind: ServiceAccount
-  name: {{ template "kube-state-metrics.fullname" $ }}
+  name: {{ template "kube-state-metrics.serviceAccountName" $ }}
   namespace: {{ template "kube-state-metrics.namespace" $ }}
 {{- end -}}
 {{- end -}}
diff --git a/charts/kube-state-metrics/templates/serviceaccount.yaml b/charts/kube-state-metrics/templates/serviceaccount.yaml
index 2e8a1ee3..365ccec5 100644
--- a/charts/kube-state-metrics/templates/serviceaccount.yaml
+++ b/charts/kube-state-metrics/templates/serviceaccount.yaml
@@ -7,7 +7,7 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-  name: {{ template "kube-state-metrics.fullname" . }}
+  name: {{ template "kube-state-metrics.serviceAccountName" . }}
   namespace: {{ template "kube-state-metrics.namespace" . }}
 {{- if .Values.serviceAccount.annotations }}
   annotations:
diff --git a/charts/kube-state-metrics/templates/stsdiscovery-rolebinding.yaml b/charts/kube-state-metrics/templates/stsdiscovery-rolebinding.yaml
index 6a2e5bfe..2e432779 100644
--- a/charts/kube-state-metrics/templates/stsdiscovery-rolebinding.yaml
+++ b/charts/kube-state-metrics/templates/stsdiscovery-rolebinding.yaml
@@ -15,6 +15,6 @@ roleRef:
   name: stsdiscovery-{{ template "kube-state-metrics.fullname" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ template "kube-state-metrics.fullname" . }}
+    name: {{ template "kube-state-metrics.serviceAccountName" . }}
     namespace: {{ template "kube-state-metrics.namespace" . }}
 {{- end }}