fix(serviceAccount): remove top level dict .spec

templates/prometheus-postgres-exporter/serviceAccount.yaml

@@ -13,14 +13,13 @@ metadata:
   {{- end }}
   name: {{ include "prometheus-postgres-exporter.fullname" . }}
   namespace: {{ .Release.Namespace }}
-spec:
+automountServiceAccountToken: {{ .Values.serviceAccount.new.automountServiceAccountToken }}
-  automountServiceAccountToken: {{ .Values.serviceAccount.new.automountServiceAccountToken }}
+{{- with .Values.serviceAccount.new.imagePullSecrets }}
-  {{- with .Values.serviceAccount.new.imagePullSecrets }}
+imagePullSecrets:
-  imagePullSecrets:
+  {{- toYaml . | nindent 4 }}
-    {{- toYaml . | nindent 4 }}
+{{- end }}
-  {{- end }}
+{{- with .Values.serviceAccount.new.secrets }}
-  {{- with .Values.serviceAccount.new.secrets }}
+secrets:
-  secrets:
+  {{- toYaml . | nindent 4 }}
-    {{- toYaml . | nindent 4 }}
+{{- end }}
-  {{- end }}
 {{- end }}

unittests/serviceAccounts/serviceAccount.yaml

@@ -29,12 +29,12 @@ tests:
   - notExists:
       path: metadata.labels
   - equal:
-      path: spec.automountServiceAccountToken
+      path: automountServiceAccountToken
       value: true
   - notExists:
-      path: spec.imagePullSecrets
+      path: imagePullSecrets
   - notExists:
-      path: spec.secrets
+      path: secrets
 
 
 - it: Rendering serviceAccount with custom values.
@@ -65,14 +65,14 @@ tests:
       path: metadata.name
       value: prometheus-postgres-exporter-unittest
   - equal:
-      path: spec.automountServiceAccountToken
+      path: automountServiceAccountToken
       value: false
   - equal:
-      path: spec.imagePullSecrets
+      path: imagePullSecrets
       value:
         - name: "my-pull-secret"
   - equal:
-      path: spec.secrets
+      path: secrets
       value:
       - name: "my-secret"
         namespace: "my-namespace"