Merge pull request rancher#44975 from rancher/revert-44945-release/v2.8

[release/v2.8] Updating branch references for rancher/charts to dev-v2.8
caliskanugur · Apr 1, 2024 · 0e928d5 · 0e928d5
2 parents 2a64213 + e7c55c3
commit 0e928d5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/package/Dockerfile b/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.8
-ARG CHART_DEFAULT_BRANCH=release-v2.8
+ARG SYSTEM_CHART_DEFAULT_BRANCH=dev-v2.8
+ARG CHART_DEFAULT_BRANCH=dev-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
@@ -114,7 +114,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.8")
+	ChartDefaultBranch                  = NewSetting("chart-default-branch", "dev-v2.8")
 	SystemManagedChartsOperationTimeout = NewSetting("system-managed-charts-operation-timeout", "300s")
 	PartnerChartDefaultBranch           = NewSetting("partner-chart-default-branch", "main")
 	RKE2ChartDefaultBranch              = NewSetting("rke2-chart-default-branch", "main")

diff --git 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:-"release-v2.8"}
+SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"dev-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:-"release-v2.8"}
+CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"dev-v2.8"}
 
 IMAGE=${REPO}/rancher:${TAG}
 AGENT_IMAGE=${REPO}/rancher-agent:${AGENT_TAG}

diff --git 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.8
-ARG CHART_DEFAULT_BRANCH=release-v2.8
+ARG SYSTEM_CHART_DEFAULT_BRANCH=dev-v2.8
+ARG CHART_DEFAULT_BRANCH=dev-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
@@ -145,7 +145,7 @@ COPY --from=rancher/k3s:v1.28.6-k3s2 \
     /bin/runc \
     /bin/which \
     /bin/aux/xtables-legacy-multi \
-    /usr/bin/
+/usr/bin/
 
 RUN ln -s /usr/bin/cni /usr/bin/bridge && \
     ln -s /usr/bin/cni /usr/bin/flannel && \