summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Dimcheff <brandon.dimcheff@gmail.com>2019-05-28 02:59:27 +0000
committerStan Hu <stanhu@gmail.com>2019-05-28 02:59:27 +0000
commitf3673b87cc2ff6290f671efaf6514a7863abaf28 (patch)
tree8ac4f5145a3ce9d180bd5a12b26868d5717a92f8
parent2b8d597f2f60243008f58ee63b2264fc72f12215 (diff)
downloadgitlab-ce-f3673b87cc2ff6290f671efaf6514a7863abaf28.tar.gz
add postgres version to subsequent helm deploys
If the postgres image version isn't passed to upgrades, helm will revert to the default postgres version. If it crosses incompatible version boundaries, this will break postgres horribly, as it won't be able to read the data files.
-rw-r--r--changelogs/unreleased/fix-autodevops-postgres-versioning.yml5
-rw-r--r--lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml1
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" \