From 0c3bc584f81cf1c67798a45320b9198a653f25a3 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Wed, 3 Jan 2024 15:45:18 -0500 Subject: [PATCH] fix: use SA created from helm chart for SUC Signed-off-by: Devin Buhl --- .../app/helmrelease.yaml.j2 | 1 + .../system-upgrade-controller/app/rbac.yaml.j2 | 17 +---------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/bootstrap/templates/addons/system-upgrade-controller/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/system-upgrade-controller/app/helmrelease.yaml.j2 index bafacbf4..aae67a2e 100644 --- a/bootstrap/templates/addons/system-upgrade-controller/app/helmrelease.yaml.j2 +++ b/bootstrap/templates/addons/system-upgrade-controller/app/helmrelease.yaml.j2 @@ -71,6 +71,7 @@ spec: - {key: node-role.kubernetes.io/control-plane, operator: Exists, effect: NoSchedule} - {key: node-role.kubernetes.io/etcd, operator: Exists, effect: NoExecute} serviceAccount: + create: true name: system-upgrade service: main: diff --git a/bootstrap/templates/addons/system-upgrade-controller/app/rbac.yaml.j2 b/bootstrap/templates/addons/system-upgrade-controller/app/rbac.yaml.j2 index 95effff6..17fee325 100644 --- a/bootstrap/templates/addons/system-upgrade-controller/app/rbac.yaml.j2 +++ b/bootstrap/templates/addons/system-upgrade-controller/app/rbac.yaml.j2 @@ -1,23 +1,8 @@ --- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: system-upgrade -secrets: - - name: system-upgrade ---- -apiVersion: v1 -kind: Secret -type: kubernetes.io/service-account-token -metadata: - name: system-upgrade - annotations: - kubernetes.io/service-account.name: system-upgrade ---- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: system-upgrade + name: system-upgrade roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole