diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-01-23 13:59:44 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-01-23 13:59:44 +0000 |
| commit | ea14c1e6963f4411666804aed084344916e49ad9 (patch) | |
| tree | bda4c274321dc70ced9bd8af9b58b9e37996d357 | |
| parent | 90d0396d8344715bf3b326c81169883ce9b3d560 (diff) | |
| parent | 6e9412a0e77049a4c4987bbbc579628ecad89371 (diff) | |
| download | gitlab-ce-ea14c1e6963f4411666804aed084344916e49ad9.tar.gz | |
Merge branch 'vendor-10-4-auto-devops-template' into 'master'
Vendor 10.4 Auto DevOps template
See merge request gitlab-org/gitlab-ce!16639
| -rw-r--r-- | vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index 5ebad58e171..a7cd2bc972c 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -345,12 +345,6 @@ production: replicas="$new_replicas" fi - if [[ "$CI_PROJECT_VISIBILITY" != "public" ]]; then - secret_name='gitlab-registry' - else - secret_name='' - fi - helm upgrade --install \ --wait \ --set service.enabled="$service_enabled" \ @@ -358,7 +352,6 @@ production: --set image.repository="$CI_APPLICATION_REPOSITORY" \ --set image.tag="$CI_APPLICATION_TAG" \ --set image.pullPolicy=IfNotPresent \ - --set image.secrets[0].name="$secret_name" \ --set application.track="$track" \ --set application.database_url="$DATABASE_URL" \ --set service.url="$CI_ENVIRONMENT_URL" \ @@ -488,9 +481,6 @@ production: function create_secret() { echo "Create secret..." - if [[ "$CI_PROJECT_VISIBILITY" == "public" ]]; then - return - fi kubectl create secret -n "$KUBE_NAMESPACE" \ docker-registry gitlab-registry \ |