diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-04-17 06:29:58 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-04-17 06:29:58 +0000 |
| commit | 35d05b1c3671a291c8025e909beaac31e8ac3be5 (patch) | |
| tree | 626c02b5096926e38ad22a9a9e52dcd8d1cdb247 /lib | |
| parent | 5b90e78acbafa3a9cade87ac3060792f5fe0febe (diff) | |
| parent | 4db9418985a353b0109d8c04a178ec69cecad717 (diff) | |
| download | gitlab-ce-35d05b1c3671a291c8025e909beaac31e8ac3be5.tar.gz | |
Merge branch 'tortuetorche/gitlab-ce-patch-auto-deploy-extra-values' into 'master'
Allow extra args for helm in Auto-DevOps
See merge request gitlab-org/gitlab-ce!26838
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 1e9591e113b..d36576fe39f 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -394,6 +394,7 @@ rollout 100%: --set postgresql.postgresDatabase="$POSTGRES_DB" \ --set postgresql.imageTag="$POSTGRES_VERSION" \ --set application.initializeCommand="$DB_INITIALIZE" \ + $HELM_UPGRADE_EXTRA_ARGS \ --namespace="$KUBE_NAMESPACE" \ "$name" \ chart/ @@ -403,6 +404,7 @@ rollout 100%: --wait \ --set application.initializeCommand="" \ --set application.migrateCommand="$DB_MIGRATE" \ + $HELM_UPGRADE_EXTRA_ARGS \ --namespace="$KUBE_NAMESPACE" \ "$name" \ chart/ @@ -432,6 +434,7 @@ rollout 100%: --set postgresql.postgresPassword="$POSTGRES_PASSWORD" \ --set postgresql.postgresDatabase="$POSTGRES_DB" \ --set application.migrateCommand="$DB_MIGRATE" \ + $HELM_UPGRADE_EXTRA_ARGS \ --namespace="$KUBE_NAMESPACE" \ "$name" \ chart/ |