Use the custom service account name if present, even if serviceAccoun…

…t.create is set to false
CircleCI-Public · Dec 7, 2022 · fbbbfe4 · fbbbfe4
1 parent 52f81d6
commit fbbbfe4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -54,7 +54,11 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 RBAC names
 */}}
 {{- define "container-agent.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
 {{- default (include "container-agent.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name}}
+{{- end }}
 {{- end }}
 
 {{- define "container-agent.roleName" -}}

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -24,9 +24,7 @@ spec:
         - {{ toYaml . }}
       {{- end}}
     {{- end }}
-    {{- if .Values.serviceAccount.create }}
       serviceAccountName: {{ include "container-agent.serviceAccountName" . }}
-    {{- end }}
     {{- if .Values.agent.podSecurityContext }}
       securityContext: {{- toYaml .Values.agent.podSecurityContext | nindent 8 }}
     {{- end }}

diff --git a/templates/rbac.yaml b/templates/rbac.yaml
@@ -62,7 +62,7 @@ roleRef:
   kind: ClusterRole
   name: {{ include "container-agent.clusterRoleName" . }}
 {{- end }} # if .Values.agent.autodetectPlatform
-{{- end }} # if rbac.create
+{{- end }}
 {{- if .Values.logging.rbac.create }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1