diff --git a/package/Dockerfile b/package/Dockerfile index 1d6beacdb7c..bb697610aa2 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -38,8 +38,8 @@ WORKDIR /var/lib/rancher ARG ARCH=amd64 ARG ETCD_UNSUPPORTED_ARCH ARG IMAGE_REPO=rancher -ARG SYSTEM_CHART_DEFAULT_BRANCH=release-v2.7 -ARG CHART_DEFAULT_BRANCH=release-v2.7 +ARG SYSTEM_CHART_DEFAULT_BRANCH=dev-v2.7 +ARG CHART_DEFAULT_BRANCH=dev-v2.7 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 bfe146d68b5..422508aaf9f 100644 --- a/pkg/settings/setting.go +++ b/pkg/settings/setting.go @@ -115,7 +115,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", "release-v2.7") + ChartDefaultBranch = NewSetting("chart-default-branch", "dev-v2.7") PartnerChartDefaultBranch = NewSetting("partner-chart-default-branch", "main") RKE2ChartDefaultBranch = NewSetting("rke2-chart-default-branch", "main") FleetDefaultWorkspaceName = NewSetting("fleet-default-workspace-name", fleetconst.ClustersDefaultNamespace) // fleetWorkspaceName to assign to clusters with none diff --git a/scripts/package-env b/scripts/package-env index a2547b0c4fb..41a5b426cc7 100644 --- a/scripts/package-env +++ b/scripts/package-env @@ -2,9 +2,9 @@ ARCH=${ARCH:-"amd64"} SYSTEM_CHART_REPO_DIR=build/system-charts -SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"release-v2.7"} +SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"dev-v2.7"} CHART_REPO_DIR=build/charts -CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"release-v2.7"} +CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"dev-v2.7"} REGISTRY=${REGISTRY/:-""} IMAGE=${REGISTRY}${REPO}/rancher:${TAG} diff --git a/tests/v2/codecoverage/package/Dockerfile b/tests/v2/codecoverage/package/Dockerfile index c8c1348813c..0a1a596a5fb 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=release-v2.7 -ARG CHART_DEFAULT_BRANCH=release-v2.7 +ARG SYSTEM_CHART_DEFAULT_BRANCH=dev-v2.7 +ARG CHART_DEFAULT_BRANCH=dev-v2.7 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