Commit d5d51dda authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

Merge branch 'url-for-worker' into 'master' 

Add GITLAB_ENVIRONMENT_URL to worker deployment

See merge request gitlab-org/cluster-integration/auto-deploy-image!200
parents ae1f112d 7f9ac99c

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

version: 2.11.1

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

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

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ items: 
            value: {{ $.Values.application.database_url | quote }}

          - name: GITLAB_ENVIRONMENT_NAME

            value: {{ $.Values.gitlab.envName | quote }}

          - name: GITLAB_ENVIRONMENT_URL

            value: {{ $.Values.gitlab.envURL | quote }}

{{- with $livenessProbeConfig := default $.Values.livenessProbe $workerConfig.livenessProbe -}}

{{- if $livenessProbeConfig }}

          livenessProbe:

assets/auto-deploy-app/test/templates/test_helpers.go

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ import ( 
)



const (

	chartName     = "auto-deploy-app-2.10.0"

	chartName     = "auto-deploy-app-2.11.1"

	helmChartPath = "../.."

)