leftyer/rancher
1
0
Fork 0
mirror of https://gitee.com/rancher/rancher.git synced 2025-12-06 15:59:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

changing chart references (#52892)

Browse Source
This commit is contained in:
Nicholas openSUSE Software Engineer
2025-11-28 18:57:06 -03:00
committed by GitHub
parent 917e4b8500
commit a629bca84c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/Dockerfile
View File

@@ -17,7 +17,7 @@ ARG GODEP_STEVE_PATH
ARG GODEP_WRANGLER=scratch
ARG GODEP_WRANGLER_PATH
ARG CHART_DEFAULT_BRANCH=release-v2.11
ARG CHART_DEFAULT_BRANCH=dev-v2.11
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

2
pkg/settings/setting.go
View File

@@ -121,7 +121,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.11")
ChartDefaultBranch = NewSetting("chart-default-branch", "dev-v2.11")
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)

2
scripts/package-env
View File

@@ -2,7 +2,7 @@
ARCH=${ARCH:-"amd64"}
CHART_REPO_DIR=build/charts
CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"release-v2.11"}
CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"dev-v2.11"}
REGISTRY=${REGISTRY/:-""}
IMAGE=${REGISTRY}${REPO}/rancher:${TAG}

2
tests/v2/codecoverage/package/Dockerfile
View File

@@ -41,7 +41,7 @@ WORKDIR /var/lib/rancher
ARG ARCH=amd64
ARG ETCD_UNSUPPORTED_ARCH
ARG IMAGE_REPO=rancher
ARG CHART_DEFAULT_BRANCH=release-v2.11
ARG CHART_DEFAULT_BRANCH=dev-v2.11
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