diff --git a/doc/settings/database.md b/doc/settings/database.md index de531a50acefe8949a2e100ad9d4b24f0958b02b_ZG9jL3NldHRpbmdzL2RhdGFiYXNlLm1k..2fb8125b2f3d8e26a899029d32ef2d31a7507d30_ZG9jL3NldHRpbmdzL2RhdGFiYXNlLm1k 100644 --- a/doc/settings/database.md +++ b/doc/settings/database.md @@ -489,6 +489,6 @@ ``` To upgrade to a specific PostgreSQL version, use the `-V` flag to append the -version. For example, to upgrade to PostgreSQL 14: +version. For example, to upgrade to PostgreSQL 16: ```shell @@ -493,6 +493,6 @@ ```shell -sudo gitlab-ctl pg-upgrade -V 14 +sudo gitlab-ctl pg-upgrade -V 16 ``` NOTE: @@ -576,6 +576,6 @@ the package (for example: GitLab 12.8 where PostgreSQL 9.6.x, 10.x, and 11.x are shipped). -To specify a target PostgreSQL version of 12: +To specify a target PostgreSQL version of 14: ```shell @@ -580,6 +580,6 @@ ```shell -gitlab-ctl revert-pg-upgrade -V 12 +gitlab-ctl revert-pg-upgrade -V 14 ``` If the target version is not specified, it will use the version in `/var/opt/gitlab/postgresql-version.old` diff --git a/files/gitlab-ctl-commands/pg-upgrade.rb b/files/gitlab-ctl-commands/pg-upgrade.rb index de531a50acefe8949a2e100ad9d4b24f0958b02b_ZmlsZXMvZ2l0bGFiLWN0bC1jb21tYW5kcy9wZy11cGdyYWRlLnJi..2fb8125b2f3d8e26a899029d32ef2d31a7507d30_ZmlsZXMvZ2l0bGFiLWN0bC1jb21tYW5kcy9wZy11cGdyYWRlLnJi 100644 --- a/files/gitlab-ctl-commands/pg-upgrade.rb +++ b/files/gitlab-ctl-commands/pg-upgrade.rb @@ -759,7 +759,7 @@ end def new_version - PGVersion.parse(version_from_manifest('postgresql')) + PGVersion.parse(version_from_manifest('postgresql_new')) || PGVersion.parse(version_from_manifest('postgresql')) end SUPPORTED_VERSIONS = [old_version, default_version, new_version].freeze