From f1c71731d952d490de5bdd2ec3d808e09d0ffd87 Mon Sep 17 00:00:00 2001 From: Stefan Klein Date: Mon, 21 Mar 2022 16:13:25 +0100 Subject: [PATCH] feat(kubernetes/chart): explicitly mount service-account-token in deployment --- .../kubernetes/chart/reloader/templates/deployment.yaml | 3 +++ .../kubernetes/chart/reloader/templates/serviceaccount.yaml | 3 +++ deployments/kubernetes/chart/reloader/values.yaml | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml index 90cd67e2..48f7790e 100644 --- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml +++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml @@ -178,6 +178,9 @@ spec: securityContext: {{ toYaml .Values.reloader.deployment.securityContext | nindent 8 }} {{- end }} serviceAccountName: {{ template "reloader-serviceAccountName" . }} +{{- if hasKey .Values.reloader.deployment "automountServiceAccountToken" }} + automountServiceAccountToken: {{ .Values.reloader.deployment.automountServiceAccountToken }} +{{- end }} {{- if eq .Values.reloader.readOnlyRootFileSystem true }} volumes: - emptyDir: {} diff --git a/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml b/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml index 144344f7..22d3f2ee 100644 --- a/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml +++ b/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml @@ -4,6 +4,9 @@ kind: ServiceAccount {{- if .Values.global.imagePullSecrets }} imagePullSecrets: {{ toYaml .Values.global.imagePullSecrets | nindent 2 }} {{- end }} +{{- if hasKey .Values.reloader.serviceAccount "automountServiceAccountToken" }} +automountServiceAccountToken: {{ .Values.reloader.serviceAccount.automountServiceAccountToken }} +{{- end }} metadata: annotations: {{ include "reloader-helm3.annotations" . | indent 4 }} diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index 2c2ee5dc..c0af632b 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -118,7 +118,7 @@ reloader: annotations: {} # The name of the ServiceAccount to use. # If not set and create is true, a name is generated using the fullname template - name: + name: # Optional flags to pass to the Reloader entrypoint # Example: # custom_annotations: