From 6147a12a4f3e0e6e7346cdd2b8515cd69bfd2d37 Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 28 Sep 2022 15:03:54 +0200
Subject: [PATCH] fix: Fix uses of serviceAccountNameController vs
 serviceAccountName

---
 .../templates/clusterrolebinding.yaml                     | 8 ++++----
 charts/flux-kluctl-controller/templates/rolebinding.yaml  | 2 +-
 .../flux-kluctl-controller/templates/serviceaccount.yaml  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/flux-kluctl-controller/templates/clusterrolebinding.yaml b/charts/flux-kluctl-controller/templates/clusterrolebinding.yaml
index 9b1ae63..df90044 100644
--- 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
index 777b60d..1a1e390 100644
--- 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
index f56657e..1495cdb 100644
--- 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: