From 4e89a9860c4d8625320e7b1761dcf90c3dc7dbe0 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 9 May 2022 11:45:18 -0400 Subject: [PATCH 1/2] Only permit 15.0 upgrade from 14.10 - Only allow administrators to upgrade to a chart with GitLab 15.0 if they have 14.10 installed Closes https://gitlab.com/gitlab-org/charts/gitlab/-/issues/3285 Changelog: changed Signed-off-by: Robert Marshall --- templates/_runcheck.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/_runcheck.tpl b/templates/_runcheck.tpl index 51ad583cd3..a7bf9b0223 100644 --- a/templates/_runcheck.tpl +++ b/templates/_runcheck.tpl @@ -29,8 +29,8 @@ if [ -d "${secrets_dir}" ]; then fi fi fi -MIN_VERSION=14.0 -CHART_MIN_VERSION=5.0 +MIN_VERSION=14.10 +CHART_MIN_VERSION=5.10 # Only run check for semver releases if ! awk 'BEGIN{exit(!(ARGV[1] ~ /^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/))}' "$GITLAB_VERSION"; then @@ -69,7 +69,7 @@ if [ ${OLD_MAJOR_VERSION} -lt ${NEW_MAJOR_VERSION} ] || [ ${OLD_CHART_MAJOR_VERS if ( ! greater_version $OLD_MINOR_VERSION $MIN_VERSION ) || ( ! greater_version $OLD_CHART_MINOR_VERSION $CHART_MIN_VERSION ); then notify "It seems you are upgrading the GitLab Helm Chart from ${OLD_CHART_VERSION_STRING} (GitLab ${OLD_VERSION_STRING}) to ${CHART_VERSION} (GitLab ${GITLAB_VERSION})." notify "It is required to upgrade to the latest ${CHART_MIN_VERSION}.x version first before proceeding." - notify "Please follow the upgrade documentation at https://docs.gitlab.com/charts/releases/5_0.html" + notify "Please follow the upgrade documentation at https://docs.gitlab.com/charts/releases/6_0.html" notify "and upgrade to GitLab Helm Chart version ${CHART_MIN_VERSION}.x before upgrading to ${CHART_VERSION}." exit 1 fi -- GitLab From 28df7e01fb9d0eb00101d5d5f18e1cb03bfa6326 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Wed, 11 May 2022 18:06:15 -0400 Subject: [PATCH 2/2] Include documentation item - Include a documentation item for the 5.x to 6.0 upgrade path Signed-off-by: Robert Marshall --- doc/releases/6_0.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/releases/6_0.md b/doc/releases/6_0.md index 1d2ea269cc..788d0181ae 100644 --- a/doc/releases/6_0.md +++ b/doc/releases/6_0.md @@ -14,6 +14,9 @@ Along with the `15.0` release of GitLab, we have bumped the chart version to `6. ## Upgrade path from 5.x +In order to upgrade to the `6.0` version of the chart, you first need to upgrade to the latest `5.10.x` +release of the chart. Check the [version mapping details](../installation/version_mappings.md) for the latest patch. + ## Major Changes ### PostgreSQL -- GitLab