From 69e131ee69701bd5c971d4817c108b123c0d0fab Mon Sep 17 00:00:00 2001 From: yaohwu Date: Sun, 9 Jul 2023 03:18:31 +0800 Subject: [PATCH] Fix helm templating syntax in post-job (#17605) --- helm/minio/templates/post-job.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/helm/minio/templates/post-job.yaml b/helm/minio/templates/post-job.yaml index 5316b8a8c..5feb78317 100644 --- a/helm/minio/templates/post-job.yaml +++ b/helm/minio/templates/post-job.yaml @@ -85,22 +85,22 @@ spec: {{- if .Values.serviceAccount.create }} serviceAccountName: {{ .Values.serviceAccount.name }} {{- end }} - {{ - if .Values.policies }} + {{- if .Values.policies }} initContainers: - name: minio-make-policy image: "{{ .Values.mcImage.repository }}:{{ .Values.mcImage.tag }}" - {{ - if .Values.makePolicyJob.securityContext.enabled }} + {{- if .Values.makePolicyJob.securityContext.enabled }} securityContext: runAsUser: {{ .Values.makePolicyJob.securityContext.runAsUser }} runAsGroup: {{ .Values.makePolicyJob.securityContext.runAsGroup }} - {{ - end }} + {{- end }} imagePullPolicy: {{ .Values.mcImage.pullPolicy }} - {{ - if .Values.makePolicyJob.exitCommand }} + {{- if .Values.makePolicyJob.exitCommand }} command: [ "/bin/sh", "-c" ] args: [ "/bin/sh /config/add-policy; EV=$?; {{ .Values.makePolicyJob.exitCommand }} && exit $EV" ] - {{ - else }} + {{- else }} command: [ "/bin/sh", "/config/add-policy" ] - {{ - end }} + {{- end }} env: - name: MINIO_ENDPOINT value: {{ template "minio.fullname" . }} @@ -113,12 +113,12 @@ spec: mountPath: /tmp - name: minio-configuration mountPath: /config - {{ - if .Values.tls.enabled }} + {{- if .Values.tls.enabled }} - name: cert-secret-volume-mc mountPath: {{ .Values.configPathmc }}certs {{- end }} - resources: {{ - toYaml .Values.makePolicyJob.resources | nindent 12 }} - {{ - end }} + resources: {{- toYaml .Values.makePolicyJob.resources | nindent 12 }} + {{- end }} containers: {{- if .Values.buckets }} - name: minio-make-bucket