From 5f4454a732bd4a040614dabd5fdad535e8c7492e Mon Sep 17 00:00:00 2001 From: Zadkiel AHARONIAN Date: Wed, 13 Nov 2024 18:31:52 +0100 Subject: [PATCH] fix: allow disabling custom service accounts Signed-off-by: GitHub --- application/templates/cronjob.yaml | 8 ++------ application/templates/deployment.yaml | 8 ++------ application/templates/job.yaml | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/application/templates/cronjob.yaml b/application/templates/cronjob.yaml index 3db0c94c..6e84378b 100644 --- a/application/templates/cronjob.yaml +++ b/application/templates/cronjob.yaml @@ -54,12 +54,8 @@ spec: annotations: {{ toYaml . | nindent 12 }} {{- end }} spec: - {{- if $.Values.rbac.enabled }} - {{- if $.Values.rbac.serviceAccount.name }} - serviceAccountName: {{ $.Values.rbac.serviceAccount.name }} - {{- else }} - serviceAccountName: {{ template "application.name" $ }} - {{- end }} + {{- if and $.Values.rbac.enabled $.Values.rbac.serviceAccount.enabled }} + serviceAccountName: {{ default (include "application.name" $) $.Values.rbac.serviceAccount.name }} {{- end }} containers: - name: {{ $name }} diff --git a/application/templates/deployment.yaml b/application/templates/deployment.yaml index 4f5bfd23..3a536a1e 100644 --- a/application/templates/deployment.yaml +++ b/application/templates/deployment.yaml @@ -308,12 +308,8 @@ spec: {{- end }} {{- end }} {{- end }} - {{- if .Values.rbac.serviceAccount.enabled }} - {{- if .Values.rbac.serviceAccount.name }} - serviceAccountName: {{ .Values.rbac.serviceAccount.name }} - {{- else }} - serviceAccountName: {{ template "application.name" $ }} - {{- end }} + {{- if and .Values.rbac.enabled .Values.rbac.serviceAccount.enabled }} + serviceAccountName: {{ default (include "application.name" .) .Values.rbac.serviceAccount.name }} {{- end }} {{- if .Values.deployment.hostNetwork }} hostNetwork: {{ .Values.deployment.hostNetwork }} diff --git a/application/templates/job.yaml b/application/templates/job.yaml index 8097a15d..757f4433 100644 --- a/application/templates/job.yaml +++ b/application/templates/job.yaml @@ -37,12 +37,8 @@ spec: annotations: {{ toYaml . | nindent 8 }} {{- end }} spec: - {{- if $.Values.rbac.enabled }} - {{- if $.Values.rbac.serviceAccount.name }} - serviceAccountName: {{ $.Values.rbac.serviceAccount.name }} - {{- else }} - serviceAccountName: {{ template "application.name" $ }} - {{- end }} + {{- if and $.Values.rbac.enabled $.Values.rbac.serviceAccount.enabled }} + serviceAccountName: {{ default (include "application.name" $) $.Values.rbac.serviceAccount.name }} {{- end }} containers: - name: {{ $name }}