Commit 73432ed5 authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

Merge branch 'fix-worker-command-numbers' into 'master' 

fix: retain types on worker commands items

See merge request gitlab-org/cluster-integration/auto-deploy-image!274
parents 67efa9df 7d4e80fe

assets/auto-deploy-app/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
apiVersion: v1

description: GitLab's Auto-deploy Helm Chart

name: auto-deploy-app

version: 2.28.0

version: 2.28.1

icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png

assets/auto-deploy-app/templates/worker-deployment.yaml

+2 −6
Original line number Diff line number Diff line
@@ -82,9 +82,7 @@ items: 
        - name: {{ $.Chart.Name }}-{{ $workerName }}

          image: {{ template "imagename" $ }}

          command:

          {{- range $workerConfig.command }}

          - {{ . }}

          {{- end }}

{{ toYaml $workerConfig.command | indent 10 }}

          imagePullPolicy: {{ $.Values.image.pullPolicy }}

          {{- if $.Values.application.secretName }}

          envFrom:
@@ -149,9 +147,7 @@ items: 
            preStop:

              exec:

                command:

                {{- range $workerConfig.preStopCommand }}

                - {{ . }}

                {{- end }}

{{ toYaml $workerConfig.preStopCommand | indent 16 }}

            {{- end}}

          {{- end }}

          resources: