diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-28 02:59:28 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-28 02:59:28 +0000 |
| commit | 5ad97713b6ccdb8e90af8f4563e3cb1f7ebc7b71 (patch) | |
| tree | 8ac4f5145a3ce9d180bd5a12b26868d5717a92f8 | |
| parent | 2b8d597f2f60243008f58ee63b2264fc72f12215 (diff) | |
| parent | f3673b87cc2ff6290f671efaf6514a7863abaf28 (diff) | |
| download | gitlab-ce-5ad97713b6ccdb8e90af8f4563e3cb1f7ebc7b71.tar.gz | |
Merge branch 'fix-autodevops-postgres-versioning' into 'master'
add postgres version to subsequent helm deploys
See merge request gitlab-org/gitlab-ce!28735
| -rw-r--r-- | changelogs/unreleased/fix-autodevops-postgres-versioning.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-autodevops-postgres-versioning.yml b/changelogs/unreleased/fix-autodevops-postgres-versioning.yml new file mode 100644 index 00000000000..8ddc70f6314 --- /dev/null +++ b/changelogs/unreleased/fix-autodevops-postgres-versioning.yml @@ -0,0 +1,5 @@ +--- +title: Fixed ignored postgres version that occurs after the first autodevops deploy when specifying custom $POSTGRES_VERSION +merge_request: 28735 +author: Brandon Dimcheff +type: fixed diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 11569437cb6..1d55c64ec56 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -432,6 +432,7 @@ rollout 100%: --set postgresql.postgresUser="$POSTGRES_USER" \ --set postgresql.postgresPassword="$POSTGRES_PASSWORD" \ --set postgresql.postgresDatabase="$POSTGRES_DB" \ + --set postgresql.imageTag="$POSTGRES_VERSION" \ --set application.migrateCommand="$DB_MIGRATE" \ $HELM_UPGRADE_EXTRA_ARGS \ --namespace="$KUBE_NAMESPACE" \ |