Commit 0283c102 authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

Merge branch 'work_labels' into 'master' 

feat: worker label

See merge request gitlab-org/cluster-integration/auto-deploy-image!249
parents 8423e347 30d5e45e

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.22.1

version: 2.23.0

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

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

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ items: 
          track: "{{ $.Values.application.track }}"

          tier: worker

          release: {{ $.Release.Name }}

{{- with $workerConfig.labels  }}

{{ toYaml . | indent 10 }}

{{- end }}

      spec:

{{- if or ($.Values.serviceAccount.name) ($.Values.serviceAccountName) }}

        serviceAccountName: {{ $.Values.serviceAccount.name | default $.Values.serviceAccountName | quote }}

assets/auto-deploy-app/values.yaml

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ workers: {} 
  # worker:

  #   replicaCount: 1

  #   terminationGracePeriodSeconds: 60

  #   labels:

  #     worker-type: worker

  #   command:

  #   - /bin/herokuish

  #   - procfile