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 | |
| 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
| -rw-r--r-- | changelogs/unreleased/tortuetorche-gitlab-ce-patch-auto-deploy-extra-values.yml | 5 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 1 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/changelogs/unreleased/tortuetorche-gitlab-ce-patch-auto-deploy-extra-values.yml b/changelogs/unreleased/tortuetorche-gitlab-ce-patch-auto-deploy-extra-values.yml new file mode 100644 index 00000000000..84ed4a8fccb --- /dev/null +++ b/changelogs/unreleased/tortuetorche-gitlab-ce-patch-auto-deploy-extra-values.yml @@ -0,0 +1,5 @@ +--- +title: Allow extra arguments in helm commands when deploying the application in Auto-DevOps.gitlab-ci.yml +merge_request: 26171 +author: tortuetorche +type: changed diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 1df492ba82c..1d517a65ce2 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -767,6 +767,7 @@ also be customized, and you can easily use a [custom buildpack](#custom-buildpac | `PERFORMANCE_DISABLED` | From GitLab 11.0, this variable can be used to disable the `performance` job. If the variable is present, the job will not be created. | | `K8S_SECRET_*` | From GitLab 11.7, any variable prefixed with [`K8S_SECRET_`](#application-secret-variables) will be made available by Auto DevOps as environment variables to the deployed application. | | `KUBE_INGRESS_BASE_DOMAIN` | From GitLab 11.8, this variable can be used to set a domain per cluster. See [cluster domains](../../user/project/clusters/index.md#base-domain) for more information. | +| `HELM_UPGRADE_EXTRA_ARGS` | From GitLab 11.11, this variable allows extra arguments in `helm` commands when deploying the application. Note that using quotes will not prevent word splitting. | TIP: **Tip:** Set up the replica variables using a 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/ |