fix: Fix uses of serviceAccountNameController vs serviceAccountName

kluctl · Sep 28, 2022 · 6147a12 · 6147a12
1 parent 21b1160
commit 6147a12
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/charts/flux-kluctl-controller/templates/clusterrolebinding.yaml b/charts/flux-kluctl-controller/templates/clusterrolebinding.yaml
@@ -8,7 +8,7 @@ roleRef:
   name: {{ include "flux-kluctl-controller.fullname" . }}-manager-role
 subjects:
   - kind: ServiceAccount
-    name: {{ include "flux-kluctl-controller.serviceAccountNameController" . }}
+    name: {{ include "flux-kluctl-controller.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -21,7 +21,7 @@ roleRef:
   name: {{ include "flux-kluctl-controller.fullname" . }}-kluctldeployment-editor-role
 subjects:
   - kind: ServiceAccount
-    name: {{ include "flux-kluctl-controller.serviceAccountNameController" . }}
+    name: {{ include "flux-kluctl-controller.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -34,7 +34,7 @@ roleRef:
   name: {{ include "flux-kluctl-controller.fullname" . }}-kluctldeployment-viewer-role
 subjects:
   - kind: ServiceAccount
-    name: {{ include "flux-kluctl-controller.serviceAccountNameController" . }}
+    name: {{ include "flux-kluctl-controller.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -47,5 +47,5 @@ roleRef:
   name: cluster-admin
 subjects:
   - kind: ServiceAccount
-    name: {{ include "flux-kluctl-controller.serviceAccountNameReconciler" . }}
+    name: {{ include "flux-kluctl-controller.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
diff --git a/charts/flux-kluctl-controller/templates/rolebinding.yaml b/charts/flux-kluctl-controller/templates/rolebinding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: {{ include "flux-kluctl-controller.fullname" . }}-leader-election-role
 subjects:
   - kind: ServiceAccount
-    name: {{ include "flux-kluctl-controller.serviceAccountNameController" . }}
+    name: {{ include "flux-kluctl-controller.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
diff --git a/charts/flux-kluctl-controller/templates/serviceaccount.yaml b/charts/flux-kluctl-controller/templates/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.serviceAccount.controller.create -}}
+{{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata: