Merge branch 'release-1.0' into automated-cherry-pick-of-pingcap#826-…

…upstream-release-1.0
aylei · Nov 19, 2019 · 83944da · 83944da
2 parents 1b3ba54 + 338b685
commit 83944da
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/charts/tidb-cluster/templates/tidb-initializer-job.yaml b/charts/tidb-cluster/templates/tidb-initializer-job.yaml
@@ -28,12 +28,12 @@ spec:
         - -c
         - |
 {{ tuple "scripts/_initialize_tidb_users.py.tpl" . | include "helm-toolkit.utils.template" | indent 10 }}
-        volumeMounts:
       {{- if and (ne .Values.timezone "UTC") (ne .Values.timezone "") }}
         env:
         - name: TZ
           value: {{ .Values.timezone | default "UTC" }}
       {{- end }}
+        volumeMounts:
         - name: password
           mountPath: /etc/tidb/password
           readOnly: true