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 0000000000000000000000000000000000000000..84ed4a8fccbfab4e5b2a2e0cd5522122a3cd5185 --- /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 7693109b3c4c5f43b5abb7f5d5aaf7054a80dfa9..fcfd498082e2241ebe456c1d10bf26fb9f3b6a33 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 a8e34cdf2960059bd38115c7352641837018a0eb..ffd27a3a9ced857e131455d8b4d3e5cac0aa5aa3 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/