Commit 35d05b1c authored by Grzegorz Bizon's avatar Grzegorz Bizon

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
parents 5b90e78a 4db94189
---
title: Allow extra arguments in helm commands when deploying the application in Auto-DevOps.gitlab-ci.yml
merge_request: 26171
author: tortuetorche
type: changed
...@@ -767,6 +767,7 @@ also be customized, and you can easily use a [custom buildpack](#custom-buildpac ...@@ -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. | | `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. | | `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. | | `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:** TIP: **Tip:**
Set up the replica variables using a Set up the replica variables using a
......
...@@ -394,6 +394,7 @@ rollout 100%: ...@@ -394,6 +394,7 @@ rollout 100%:
--set postgresql.postgresDatabase="$POSTGRES_DB" \ --set postgresql.postgresDatabase="$POSTGRES_DB" \
--set postgresql.imageTag="$POSTGRES_VERSION" \ --set postgresql.imageTag="$POSTGRES_VERSION" \
--set application.initializeCommand="$DB_INITIALIZE" \ --set application.initializeCommand="$DB_INITIALIZE" \
$HELM_UPGRADE_EXTRA_ARGS \
--namespace="$KUBE_NAMESPACE" \ --namespace="$KUBE_NAMESPACE" \
"$name" \ "$name" \
chart/ chart/
...@@ -403,6 +404,7 @@ rollout 100%: ...@@ -403,6 +404,7 @@ rollout 100%:
--wait \ --wait \
--set application.initializeCommand="" \ --set application.initializeCommand="" \
--set application.migrateCommand="$DB_MIGRATE" \ --set application.migrateCommand="$DB_MIGRATE" \
$HELM_UPGRADE_EXTRA_ARGS \
--namespace="$KUBE_NAMESPACE" \ --namespace="$KUBE_NAMESPACE" \
"$name" \ "$name" \
chart/ chart/
...@@ -432,6 +434,7 @@ rollout 100%: ...@@ -432,6 +434,7 @@ rollout 100%:
--set postgresql.postgresPassword="$POSTGRES_PASSWORD" \ --set postgresql.postgresPassword="$POSTGRES_PASSWORD" \
--set postgresql.postgresDatabase="$POSTGRES_DB" \ --set postgresql.postgresDatabase="$POSTGRES_DB" \
--set application.migrateCommand="$DB_MIGRATE" \ --set application.migrateCommand="$DB_MIGRATE" \
$HELM_UPGRADE_EXTRA_ARGS \
--namespace="$KUBE_NAMESPACE" \ --namespace="$KUBE_NAMESPACE" \
"$name" \ "$name" \
chart/ chart/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment