summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJames Fargher <proglottis@gmail.com>2019-04-17 08:52:16 +1200
committerJames Fargher <proglottis@gmail.com>2019-04-17 08:52:16 +1200
commit4db9418985a353b0109d8c04a178ec69cecad717 (patch)
tree1e2feeec654e88abfce8c9997e30e3598c6c45da /lib
parent6cb64c44c8d33024e09090c70e4bd949d6e49cfc (diff)
downloadgitlab-ce-4db9418985a353b0109d8c04a178ec69cecad717.tar.gz
Rename HELM_EXTRA_ARGS to differentiate between helm invocationstortuetorche/gitlab-ce-patch-auto-deploy-extra-values
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
index ffd27a3a9ce..d36576fe39f 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -394,7 +394,7 @@ rollout 100%:
--set postgresql.postgresDatabase="$POSTGRES_DB" \
--set postgresql.imageTag="$POSTGRES_VERSION" \
--set application.initializeCommand="$DB_INITIALIZE" \
- $HELM_EXTRA_ARGS \
+ $HELM_UPGRADE_EXTRA_ARGS \
--namespace="$KUBE_NAMESPACE" \
"$name" \
chart/
@@ -404,7 +404,7 @@ rollout 100%:
--wait \
--set application.initializeCommand="" \
--set application.migrateCommand="$DB_MIGRATE" \
- $HELM_EXTRA_ARGS \
+ $HELM_UPGRADE_EXTRA_ARGS \
--namespace="$KUBE_NAMESPACE" \
"$name" \
chart/
@@ -434,7 +434,7 @@ rollout 100%:
--set postgresql.postgresPassword="$POSTGRES_PASSWORD" \
--set postgresql.postgresDatabase="$POSTGRES_DB" \
--set application.migrateCommand="$DB_MIGRATE" \
- $HELM_EXTRA_ARGS \
+ $HELM_UPGRADE_EXTRA_ARGS \
--namespace="$KUBE_NAMESPACE" \
"$name" \
chart/