From b844935fb6801878c43e7286b2eeb4f117e6fbc6 Mon Sep 17 00:00:00 2001
From: Thibault Jamet <tjamet@users.noreply.github.com>
Date: Mon, 7 Oct 2024 16:20:03 +0200
Subject: [PATCH] Stop using default service account (#6)

Change-Id: I964b3a3876bb36c058f6f3590f932c00e074ec68

Co-authored-by: Thibault Jamet <thibault.jamet@adevinta.com>
---
 .../traffic-controller/templates/deployment.yaml       |  2 ++
 helm-chart/traffic-controller/templates/rbac.yaml      | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/helm-chart/traffic-controller/templates/deployment.yaml b/helm-chart/traffic-controller/templates/deployment.yaml
index 3025440..6af70d4 100644
--- a/helm-chart/traffic-controller/templates/deployment.yaml
+++ b/helm-chart/traffic-controller/templates/deployment.yaml
@@ -36,6 +36,8 @@ spec:
       labels:
         control-plane: controller-manager
     spec:
+      serviceAccountName: {{ .Release.Name }}
+      automountServiceAccountToken: true
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
diff --git a/helm-chart/traffic-controller/templates/rbac.yaml b/helm-chart/traffic-controller/templates/rbac.yaml
index 6a5dadb..99aa921 100644
--- a/helm-chart/traffic-controller/templates/rbac.yaml
+++ b/helm-chart/traffic-controller/templates/rbac.yaml
@@ -99,7 +99,7 @@ roleRef:
   name: "{{ .Release.Name }}-leader-election-role"
 subjects:
 - kind: ServiceAccount
-  name: default
+  name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -112,5 +112,11 @@ roleRef:
   name: "{{ .Release.Name }}-manager-role"
 subjects:
 - kind: ServiceAccount
-  name: default
+  name: {{ .Release.Name }}
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}