diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2018-12-13 11:06:33 +1300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-12-18 18:04:54 +1300 |
| commit | 0711c42c26f0a5adaaf7b9303967100d81f41599 (patch) | |
| tree | 49c576b684dde374e6d4c033533fc7e030957713 | |
| parent | 45bd70ea2462b82d2554bed6c16af2448f1005fa (diff) | |
| download | gitlab-ce-0711c42c26f0a5adaaf7b9303967100d81f41599.tar.gz | |
Pass in secretname to application container
The secretname may be present, if nil, the chart does nothing. If
present, the chart will load the key-value pairs from the secret into
the application container. See
https://gitlab.com/charts/auto-deploy-app/blob/master/README.md#configuration
| -rw-r--r-- | changelogs/unreleased/49056-configure-auto-devops-deployed-applications-with-secrets-that-aren-t-committed-to-the-repo.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/49056-configure-auto-devops-deployed-applications-with-secrets-that-aren-t-committed-to-the-repo.yml b/changelogs/unreleased/49056-configure-auto-devops-deployed-applications-with-secrets-that-aren-t-committed-to-the-repo.yml new file mode 100644 index 00000000000..65efa85176b --- /dev/null +++ b/changelogs/unreleased/49056-configure-auto-devops-deployed-applications-with-secrets-that-aren-t-committed-to-the-repo.yml @@ -0,0 +1,5 @@ +--- +title: Configure Auto DevOps deployed applications with secrets from prefixed CI variables +merge_request: 23719 +author: +type: added diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index 2726f3274cc..ad1c6f2bf92 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -657,6 +657,7 @@ rollout 100%: --set image.secrets[0].name="$secret_name" \ --set application.track="$track" \ --set application.database_url="$DATABASE_URL" \ + --set application.secretName="$application_secret_name" \ --set service.url="$CI_ENVIRONMENT_URL" \ --set replicaCount="$replicas" \ --set postgresql.enabled="$postgres_enabled" \ @@ -689,6 +690,7 @@ rollout 100%: --set image.secrets[0].name="$secret_name" \ --set application.track="$track" \ --set application.database_url="$DATABASE_URL" \ + --set application.secretName="$application_secret_name" \ --set service.url="$CI_ENVIRONMENT_URL" \ --set replicaCount="$replicas" \ --set postgresql.enabled="$postgres_enabled" \ |