Chart.yaml

@@ -10,9 +10,8 @@ appVersion: "0.15.0"
 
 keywords:
 - prometheus
-- prometheus-exporter
+- prometheus exporter
-- postgres-postgres-exporter
+- postgres
-- postgres-exporter
 
 sources:
 - https://github.com/prometheus-community/postgres_exporter

templates/prometheus-postgres-exporter/serviceAccount.yaml

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

unittests/serviceAccounts/serviceAccount.yaml

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