Update chart kdm v2.6 (#187)

* Update kdm refs

* Update kdm refs

Dockerfile.dapper

@@ -12,7 +12,7 @@ ENV HELM_VERSION v3.9.0
 ENV KUSTOMIZE_VERSION v4.4.1
 
 # kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go
-ENV CATTLE_KDM_BRANCH=release-v2.6
+ENV CATTLE_KDM_BRANCH=dev-v2.6-1222-patches
 
 RUN zypper -n install gcc binutils glibc-devel-static ca-certificates git-core wget curl unzip tar vim less file xz gzip sed gawk iproute2 iptables jq
 # use containerd from k3s image, not from bci

package/Dockerfile

@@ -20,7 +20,7 @@ ARG CHART_DEFAULT_BRANCH=dev-v2.6
 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
-ARG CATTLE_KDM_BRANCH=release-v2.6
+ARG CATTLE_KDM_BRANCH=dev-v2.6-1222-patches
 
 ENV CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH
 ENV CATTLE_CHART_DEFAULT_BRANCH=$CHART_DEFAULT_BRANCH

pkg/image/external/external_test.go

@@ -22,7 +22,7 @@ const (
 	rke2WebVersion = "v1.23.6+rke2r1"
 	rke2           = "rke2"
 	rke1           = "rke1"
-	devKDM         = "https://github.com/rancher/kontainer-driver-metadata/raw/dev-v2.6/data/data.json"
+	devKDM         = "https://github.com/rancher/kontainer-driver-metadata/raw/dev-v2.6-1222-patches/data/data.json"
 	releaseKDM     = "https://releases.rancher.com/kontainer-driver-metadata/release-v2.6/data.json"
 )
 

pkg/settings/setting.go

@@ -56,7 +56,7 @@ var (
 	KubernetesVersionToSystemImages     = NewSetting("k8s-version-to-images", "")
 	KubernetesVersionsCurrent           = NewSetting("k8s-versions-current", "")
 	KubernetesVersionsDeprecated        = NewSetting("k8s-versions-deprecated", "")
-	KDMBranch                           = NewSetting("kdm-branch", "release-v2.6")
+	KDMBranch                           = NewSetting("kdm-branch", "dev-v2.6-1222-patches")
 	MachineVersion                      = NewSetting("machine-version", "dev")
 	Namespace                           = NewSetting("namespace", os.Getenv("CATTLE_NAMESPACE"))
 	PasswordMinLength                   = NewSetting("password-min-length", "12")
@@ -90,7 +90,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.6")
+	ChartDefaultBranch                  = NewSetting("chart-default-branch", "dev-v2.6.10")
 	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

scripts/change-final-rc-values

@@ -6,7 +6,7 @@ fi
 
 case $RELEASE_ACTION in
   release)
-    CURRENT_BRANCH="dev-v2.6"
+    CURRENT_BRANCH="dev-v2.6.10"
     NEW_BRANCH="release-v2.6"
     ;;
   revert)

scripts/check-chart-kdm-source-values

@@ -4,7 +4,7 @@
 
 case $RELEASE_TYPE in
   rc)
-    REQUIRED_VALUE="dev-v2.6"
+    REQUIRED_VALUE="dev-v2.6-1222-patches"
     ;;
   final-rc)
     REQUIRED_VALUE="release-v2.6"

scripts/package

@@ -7,7 +7,7 @@ ARCH=${ARCH:-"amd64"}
 SYSTEM_CHART_REPO_DIR=build/system-charts
 SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"release-v2.6"}
 CHART_REPO_DIR=build/charts
-CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"release-v2.6"}
+CHART_DEFAULT_BRANCH=${CHART_DEFAULT_BRANCH:-"dev-v2.6.10"}
 
 cd $(dirname $0)/../package