diff options
author | Stan Hu <stanhu@gmail.com> | 2019-04-25 00:18:19 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-04-25 00:18:19 +0300 |
commit | 66ff5f3dc6c19ea382192897395acfbd4adbd0c2 (patch) | |
tree | a9a8dd510c6a5168488fe3131a642fcb5f784edd /lib | |
parent | 0edd8a6e937e840c614bc436c3689a6c5a6edcb9 (diff) | |
parent | a358d8253d0b9a983fee1e0d32ce1bdfb32fa148 (diff) |
Merge branch 'autodevops_remote_private_helm_repository' into 'master'
Adding ability to specify helm chart repo using environment variables
Closes #49520
See merge request gitlab-org/gitlab-ce!27123
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index d36576fe39f..9d99d04d263 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -490,7 +490,7 @@ rollout 100%: fi helm init --client-only - helm repo add gitlab ${AUTO_DEVOPS_CHART_REPOSITORY:-https://charts.gitlab.io} + helm repo add ${AUTO_DEVOPS_CHART_REPOSITORY_NAME:-gitlab} ${AUTO_DEVOPS_CHART_REPOSITORY:-https://charts.gitlab.io} ${AUTO_DEVOPS_CHART_REPOSITORY_USERNAME:+"--username" "$AUTO_DEVOPS_CHART_REPOSITORY_USERNAME"} ${AUTO_DEVOPS_CHART_REPOSITORY_PASSWORD:+"--password" "$AUTO_DEVOPS_CHART_REPOSITORY_PASSWORD"} if [[ ! -d "$auto_chart" ]]; then helm fetch ${auto_chart} --untar fi |