fix: backport serviceAccount manifest from helm.sh default

Signed-off-by: David Sabatie <[email protected]>

Author: golgoth31

pkg/processor/pod/pod.go

@@ -222,7 +222,7 @@ func processPodSpec(name string, appMeta helmify.AppMetadata, pod *corev1.PodSpe
 			v.Secret.SecretName = appMeta.TemplatedName(v.Secret.SecretName)
 		}
 	}
-	pod.ServiceAccountName = fmt.Sprintf("{{ default \"default\" (include \"%s.serviceAccountName\" .) }}", appMeta.ChartName())
+	pod.ServiceAccountName = fmt.Sprintf(`{{ include "%s.serviceAccountName" . }}`, appMeta.ChartName())
 
 	for i, s := range pod.ImagePullSecrets {
 		pod.ImagePullSecrets[i].Name = appMeta.TemplatedName(s.Name)

pkg/processor/pod/pod_test.go

@@ -170,7 +170,7 @@ func Test_pod_Process(t *testing.T) {
 			"tolerations":               "{{- toYaml .Values.nginx.tolerations | nindent 8 }}",
 			"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
 			"nodeSelector":              "{{- toYaml .Values.nginx.nodeSelector | nindent 8 }}",
-			"serviceAccountName":        "{{ default \"default\" (include \".serviceAccountName\" .) }}",
+			"serviceAccountName":        `{{ include ".serviceAccountName" . }}`,
 		}, specMap)
 
 		assert.Equal(t, helmify.Values{
@@ -218,7 +218,7 @@ func Test_pod_Process(t *testing.T) {
 				},
 			},
 			"nodeSelector":              "{{- toYaml .Values.nginx.nodeSelector | nindent 8 }}",
-			"serviceAccountName":        "{{ default \"default\" (include \".serviceAccountName\" .) }}",
+			"serviceAccountName":        `{{ include ".serviceAccountName" . }}`,
 			"tolerations":               "{{- toYaml .Values.nginx.tolerations | nindent 8 }}",
 			"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
 		}, specMap)
@@ -264,7 +264,7 @@ func Test_pod_Process(t *testing.T) {
 				},
 			},
 			"nodeSelector":              "{{- toYaml .Values.nginx.nodeSelector | nindent 8 }}",
-			"serviceAccountName":        "{{ default \"default\" (include \".serviceAccountName\" .) }}",
+			"serviceAccountName":        `{{ include ".serviceAccountName" . }}`,
 			"tolerations":               "{{- toYaml .Values.nginx.tolerations | nindent 8 }}",
 			"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
 		}, specMap)
@@ -310,7 +310,7 @@ func Test_pod_Process(t *testing.T) {
 				},
 			},
 			"nodeSelector":              "{{- toYaml .Values.nginx.nodeSelector | nindent 8 }}",
-			"serviceAccountName":        "{{ default \"default\" (include \".serviceAccountName\" .) }}",
+			"serviceAccountName":        `{{ include ".serviceAccountName" . }}`,
 			"tolerations":               "{{- toYaml .Values.nginx.tolerations | nindent 8 }}",
 			"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
 		}, specMap)
@@ -351,7 +351,7 @@ func Test_pod_Process(t *testing.T) {
 			},
 			"securityContext":           "{{- toYaml .Values.nginx.podSecurityContext | nindent 8 }}",
 			"nodeSelector":              "{{- toYaml .Values.nginx.nodeSelector | nindent 8 }}",
-			"serviceAccountName":        "{{ default \"default\" (include \".serviceAccountName\" .) }}",
+			"serviceAccountName":        `{{ include ".serviceAccountName" . }}`,
 			"tolerations":               "{{- toYaml .Values.nginx.tolerations | nindent 8 }}",
 			"topologySpreadConstraints": "{{- toYaml .Values.nginx.topologySpreadConstraints | nindent 8 }}",
 		}, specMap)

pkg/processor/rbac/serviceaccount.go

@@ -17,8 +17,11 @@ metadata:
   name: {{ include "%[1]s.serviceAccountName" . }}
   labels:
   {{- include "%[1]s.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
   annotations:
-  {{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
 {{- end }}`
 )
 
@@ -43,6 +46,7 @@ func (sa serviceAccount) Process(appMeta helmify.AppMetadata, obj *unstructured.
 	values := helmify.Values{}
 	_, _ = values.Add(true, "serviceAccount", "create")
 	_, _ = values.Add("", "serviceAccount", "name")
+	_, _ = values.Add(true, "serviceAccount", "automount")
 	valuesAnnotations := make(map[string]interface{})
 	for k, v := range obj.GetAnnotations() {
 		valuesAnnotations[k] = v