Fixed incorrect templates rendering when use extraVolumes value (#124)

* Fixed incorrect templates rendering when use extraVolumes value Signed-off-by: Denis Buravlev <[email protected]> * Bump the chart version Signed-off-by: Denis Buravlev <[email protected]> Co-authored-by: Travis Groth <[email protected]>
pomerium · Jul 15, 2020 · 2dc7e7e · 2dc7e7e
1 parent 26f61d0
commit 2dc7e7e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/pomerium/Chart.yaml b/charts/pomerium/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: pomerium
-version: 10.1.2
+version: 10.1.3
 appVersion: 0.9.2
 home: http://www.pomerium.io/
 icon: https://www.pomerium.io/logo-long.svg

diff --git a/charts/pomerium/templates/_helpers.tpl b/charts/pomerium/templates/_helpers.tpl
@@ -396,7 +396,7 @@ policy:
     secretName: {{ template "pomerium.caSecret.name" . }}
     optional: true
 {{- if .Values.extraVolumes }}
-{{- toYaml .Values.extraVolumes | indent 8 }}
+{{ toYaml .Values.extraVolumes }}
 {{- end }}
 {{- end -}}
 

diff --git a/charts/pomerium/templates/operator-deployment.yaml b/charts/pomerium/templates/operator-deployment.yaml
@@ -92,10 +92,10 @@ spec:
       - name: config
         secret:
           secretName: {{ $baseSecretName }}
-      serviceAccountName: {{ template "pomerium.operator.serviceAccountName" . }}
 {{- if .Values.extraVolumes }}
-{{- toYaml .Values.extraVolumes | indent 8 }}
+{{ toYaml .Values.extraVolumes | indent 6 }}
 {{- end }}
+      serviceAccountName: {{ template "pomerium.operator.serviceAccountName" . }}
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}