summaryrefslogtreecommitdiff
path: root/doc/topics
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2019-04-17 06:29:58 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2019-04-17 06:29:58 +0000
commit35d05b1c3671a291c8025e909beaac31e8ac3be5 (patch)
tree626c02b5096926e38ad22a9a9e52dcd8d1cdb247 /doc/topics
parent5b90e78acbafa3a9cade87ac3060792f5fe0febe (diff)
parent4db9418985a353b0109d8c04a178ec69cecad717 (diff)
downloadgitlab-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 'doc/topics')
-rw-r--r--doc/topics/autodevops/index.md1
1 files changed, 1 insertions, 0 deletions
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