diff options
| author | James Fargher <proglottis@gmail.com> | 2019-04-02 14:51:19 +1300 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2019-04-08 16:13:37 +1200 |
| commit | 0138f5c3b1ff0fea1227d11c765de667b76ef868 (patch) | |
| tree | 4a494d03325dfac2b094a71c1acb61c0227b44fc | |
| parent | 078302f470f78b3e082611a46ac6be2db248becb (diff) | |
| download | gitlab-ce-0138f5c3b1ff0fea1227d11c765de667b76ef868.tar.gz | |
Add HELM_EXTRA_ARGS to all Auto-DevOps helm invocations
| -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 | 1 |
3 files changed, 7 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 7693109b3c4..fcfd498082e 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_EXTRA_ARGS` | From GitLab 11.11, this variable allows extra arguments in helm commands when deploying the application. For example `--set podAnnotations.fruit="apple"` | 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 a8e34cdf296..ffd27a3a9ce 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -404,6 +404,7 @@ rollout 100%: --wait \ --set application.initializeCommand="" \ --set application.migrateCommand="$DB_MIGRATE" \ + $HELM_EXTRA_ARGS \ --namespace="$KUBE_NAMESPACE" \ "$name" \ chart/ |