From d0302dbe5ef64d0c044e18f46082e00d4681fc9b Mon Sep 17 00:00:00 2001 From: nicholasSSUSE Date: Fri, 23 Aug 2024 09:23:44 -0300 Subject: [PATCH] changing branch references for charts to release --- package/Dockerfile | 4 ++-- pkg/settings/setting.go | 2 +- scripts/package-env | 4 ++-- tests/v2/codecoverage/package/Dockerfile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/Dockerfile b/package/Dockerfile index dec99d26b6d..15c23dc3b4a 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -58,8 +58,8 @@ WORKDIR /var/lib/rancher ARG ARCH=amd64 ARG ETCD_UNSUPPORTED_ARCH ARG IMAGE_REPO=rancher -ARG SYSTEM_CHART_DEFAULT_BRANCH=dev-v2.8 -ARG CHART_DEFAULT_BRANCH=dev-v2.8 +ARG SYSTEM_CHART_DEFAULT_BRANCH=release-v2.8 +ARG CHART_DEFAULT_BRANCH=release-v2.8 ARG PARTNER_CHART_DEFAULT_BRANCH=main ARG RKE2_CHART_DEFAULT_BRANCH=main # kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go diff --git a/pkg/settings/setting.go b/pkg/settings/setting.go index 077936efb51..7b78b78142f 100644 --- a/pkg/settings/setting.go +++ b/pkg/settings/setting.go @@ -120,7 +120,7 @@ var ( ClusterTemplateEnforcement = NewSetting("cluster-template-enforcement", "false") InitialDockerRootDir = NewSetting("initial-docker-root-dir", "/var/lib/docker") SystemCatalog = NewSetting("system-catalog", "external") // Options are 'external' or 'bundled' - ChartDefaultBranch = NewSetting("chart-default-branch", "dev-v2.8") + ChartDefaultBranch = NewSetting("chart-default-branch", "release-v2.8") SystemManagedChartsOperationTimeout = NewSetting("system-managed-charts-operation-timeout", "300s") FleetDefaultWorkspaceName = NewSetting("fleet-default-workspace-name", fleetconst.ClustersDefaultNamespace) // fleetWorkspaceName to assign to clusters with none ShellImage = NewSetting("shell-image", buildconfig.DefaultShellVersion) diff --git a/scripts/package-env b/scripts/package-env index bfaace70d50..1e182069dc8 100644 --- a/scripts/package-env +++ b/scripts/package-env @@ -2,11 +2,11 @@ ARCH=${ARCH:-"amd64"} SYSTEM_CHART_REPO_DIR=build/system-charts -SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"dev-v2.8"} +SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"release-v2.8"} CHART_REPO_DIR=build/charts SMALL_FORK_REPO_DIR=../build/rancher-data/local-catalogs/v2/rancher-charts-small-fork/d39a2f6abd49e537e5015bbe1a4cd4f14919ba1c3353208a7ff6be37ffe00c52 -CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"dev-v2.8"} +CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"release-v2.8"} REGISTRY=${REGISTRY/:-""} IMAGE=${REGISTRY}${REPO}/rancher:${TAG} diff --git a/tests/v2/codecoverage/package/Dockerfile b/tests/v2/codecoverage/package/Dockerfile index 276cf8b520a..580b4d59d58 100644 --- a/tests/v2/codecoverage/package/Dockerfile +++ b/tests/v2/codecoverage/package/Dockerfile @@ -16,8 +16,8 @@ WORKDIR /var/lib/rancher ARG ARCH=amd64 ARG ETCD_UNSUPPORTED_ARCH ARG IMAGE_REPO=rancher -ARG SYSTEM_CHART_DEFAULT_BRANCH=dev-v2.8 -ARG CHART_DEFAULT_BRANCH=dev-v2.8 +ARG SYSTEM_CHART_DEFAULT_BRANCH=release-v2.8 +ARG CHART_DEFAULT_BRANCH=release-v2.8 ARG PARTNER_CHART_DEFAULT_BRANCH=main ARG RKE2_CHART_DEFAULT_BRANCH=main # kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go