Merge pull request #29101 from cbron/v2.5-alpha5

V2.5 alpha5

Dockerfile.dapper

@@ -15,7 +15,7 @@ ENV HELM_VERSION v3.2.0
 ENV KUSTOMIZE_VERSION v3.5.4
 
 # kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go
-ENV RANCHER_METADATA_BRANCH=dev-v2.5
+ENV RANCHER_METADATA_BRANCH=v2.5-preview1
 
 RUN apt-get update && \
     apt-get install -y gcc ca-certificates git wget curl vim less file xz-utils unzip && \

package/Dockerfile

@@ -13,11 +13,11 @@ WORKDIR /var/lib/rancher
 
 ARG ARCH=amd64
 ARG IMAGE_REPO=rancher
-ARG SYSTEM_CHART_DEFAULT_BRANCH=dev-v2.4
-ARG CHART_DEFAULT_BRANCH=dev-v2.5
+ARG SYSTEM_CHART_DEFAULT_BRANCH=v2.5-preview1
+ARG CHART_DEFAULT_BRANCH=v2.5-preview1
 ARG PARTNER_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
-ARG RANCHER_METADATA_BRANCH=dev-v2.5
+ARG RANCHER_METADATA_BRANCH=v2.5-preview1
 
 ENV CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH
 ENV CATTLE_CHART_DEFAULT_BRANCH=$CHART_DEFAULT_BRANCH
@@ -107,8 +107,8 @@ RUN curl -sLf ${!TINI_URL} > /usr/bin/tini && \
     chmod +x /usr/bin/tini /usr/bin/telemetry /usr/bin/k3s /usr/bin/kubectl /usr/bin/channelserver && \
     mkdir -p /var/lib/rancher-data/driver-metadata
 
-ENV CATTLE_UI_VERSION v2.5.0-alpha4
-ENV CATTLE_DASHBOARD_UI_VERSION v2.5.0-alpha4
+ENV CATTLE_UI_VERSION 2.5.0-alpha5
+ENV CATTLE_DASHBOARD_UI_VERSION v2.5.0-alpha5
 ENV CATTLE_CLI_VERSION v2.4.6
 
 # Please update the api-ui-version in pkg/settings/settings.go when updating the version here.

pkg/settings/setting.go

@@ -85,7 +85,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.5")
+	ChartDefaultBranch                = NewSetting("chart-default-branch", "v2.5-preview1")
 	PartnerChartDefaultBranch         = NewSetting("partner-chart-default-branch", "main")
 	FleetDefaultWorkspaceName         = NewSetting("fleet-default-workspace-name", "fleet-default") // fleetWorkspaceName to assign to clusters with none
 	ShellImage                        = NewSetting("shell-image", "rancher/shell:v0.1.3")

scripts/package

@@ -17,8 +17,8 @@ export -f extract_latest_version_tgz
 source $(dirname $0)/version
 
 ARCH=${ARCH:-"amd64"}
-SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"dev-v2.4"}
-CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"dev-v2.5"}
+SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"v2.5-preview1"}
+CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"v2.5-preview1"}
 
 cd $(dirname $0)/../package