Merge pull request #1396 from rancher/dev-v2.7

[2.7] April 2024 Patch Release
rancher · May 13, 2024 · 264eaeb · 264eaeb
2 parents cce09b6 + 89e6f30
commit 264eaeb
Show file tree

Hide file tree

Showing 10 changed files with 1,049 additions and 11 deletions.
diff --git a/channels-rke2.yaml b/channels-rke2.yaml
@@ -1645,7 +1645,7 @@ releases:
         repo: rancher-rke2-charts
         version: 1.15.100
       rancher-vsphere-csi:
-        repo: rancher-charts
+        repo: rancher-rke2-charts
         version: 3.0.1-rancher101
       rke2-calico:
         repo: rancher-rke2-charts
@@ -1820,7 +1820,7 @@ releases:
         repo: rancher-rke2-charts
         version: 1.15.100
       rancher-vsphere-csi:
-        repo: rancher-charts
+        repo: rancher-rke2-charts
         version: 3.0.1-rancher101
       rke2-calico:
         repo: rancher-rke2-charts
@@ -1870,3 +1870,44 @@ releases:
         repo: rancher-rke2-charts
         version: v4.0.2-build2024020802
     featureVersions: *featureVersions-v1
+  - version: v1.27.13+rke2r1
+    minChannelServerVersion: v2.7.11-alpha1
+    maxChannelServerVersion: v2.8.99
+    serverArgs: &serverArgs-v1-27-13-rke2r1
+      <<: *serverArgs-v1-27-11-rke2r1
+      datastore-endpoint:
+        type: string
+      datastore-cafile:
+        type: string
+      datastore-certfile:
+        type: string
+      datastore-keyfile:
+        type: string
+    agentArgs: *agentArgs-v1-25-15-rke2r2
+    charts: &charts-v1-27-13-rke2r1
+      <<: *charts-v1-27-12-rke2r1
+      rke2-flannel:
+        repo: rancher-rke2-charts
+        version: v0.25.102
+      rke2-canal:
+        repo: rancher-rke2-charts
+        version: v3.27.3-build2024042301
+      rke2-ingress-nginx:
+        repo: rancher-rke2-charts
+        version: 4.9.100
+      rke2-calico:
+        repo: rancher-rke2-charts
+        version: v3.27.300
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.15.400
+      harvester-cloud-provider:
+        repo: rancher-rke2-charts
+        version: 0.2.300
+      rancher-vsphere-csi:
+        repo: rancher-rke2-charts
+        version: 3.1.2-rancher400
+      rke2-metrics-server:
+        repo: rancher-rke2-charts
+        version: 3.12.002
+    featureVersions: *featureVersions-v1
diff --git a/channels.yaml b/channels.yaml
@@ -557,4 +557,13 @@ releases:
     maxChannelServerVersion: v2.7.99
     serverArgs: *serverArgs-v7
     agentArgs: *agentArgs-v5
-    featureVersions: *featureVersions-v1
+    featureVersions: *featureVersions-v1
+  - version: v1.27.13+k3s1
+    minChannelServerVersion: v2.7.11-alpha1
+    maxChannelServerVersion: v2.7.99
+    serverArgs: 
+      <<: *serverArgs-v7
+      kine-tls:
+        type: boolean
+    agentArgs: *agentArgs-v5
+    featureVersions: *featureVersions-v1
diff --git a/data/data.json b/data/data.json
diff --git a/pkg/rke/k8s_defaults.go b/pkg/rke/k8s_defaults.go
@@ -128,7 +128,7 @@ func validateTemplateMatch() {
 			for toTestRange, key := range pluginData {
 				testRange, err := semver.ParseRange(toTestRange)
 				if err != nil {
-					panic(fmt.Sprintf("range for %s not sem-ver %v %v", plugin, testRange, err))
+					panic(fmt.Sprintf("range for %s not sem-ver %v %v", plugin, toTestRange, err))
 				}
 				if testRange(toMatch) {
 					// only one range should be matched

diff --git a/pkg/rke/k8s_rke_system_images.go b/pkg/rke/k8s_rke_system_images.go
@@ -10226,6 +10226,48 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			WindowsPodInfraContainer:  "rancher/mirrored-pause:3.7",
 			Nodelocal:                 "rancher/mirrored-k8s-dns-node-cache:1.22.28",
 		},
+		// Enabled in Rancher v2.7.13
+		"v1.27.13-rancher1-1": {
+			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.10",
+			Kubernetes:                "rancher/hyperkube:v1.27.13-rancher1",
+			Alpine:                    "rancher/rke-tools:v0.1.96",
+			NginxProxy:                "rancher/rke-tools:v0.1.96",
+			CertDownloader:            "rancher/rke-tools:v0.1.96",
+			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.96",
+			KubeDNS:                   "rancher/mirrored-k8s-dns-kube-dns:1.22.28",
+			DNSmasq:                   "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.22.28",
+			KubeDNSSidecar:            "rancher/mirrored-k8s-dns-sidecar:1.22.28",
+			KubeDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
+			Flannel:                   "rancher/mirrored-flannel-flannel:v0.21.4",
+			FlannelCNI:                "rancher/flannel-cni:v0.3.0-rancher8",
+			CalicoNode:                "rancher/mirrored-calico-node:v3.26.3",
+			CalicoCNI:                 "rancher/calico-cni:v3.26.3-rancher1",
+			CalicoControllers:         "rancher/mirrored-calico-kube-controllers:v3.26.3",
+			CalicoCtl:                 "rancher/mirrored-calico-ctl:v3.26.3",
+			CalicoFlexVol:             "rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3",
+			CanalNode:                 "rancher/mirrored-calico-node:v3.26.3",
+			CanalCNI:                  "rancher/calico-cni:v3.26.3-rancher1",
+			CanalControllers:          "rancher/mirrored-calico-kube-controllers:v3.26.3",
+			CanalFlannel:              "rancher/mirrored-flannel-flannel:v0.21.4",
+			CanalFlexVol:              "rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3",
+			WeaveNode:                 "weaveworks/weave-kube:2.8.1",
+			WeaveCNI:                  "weaveworks/weave-npc:2.8.1",
+			AciCniDeployContainer:     "noiro/cnideploy:6.0.4.1.81c2369",
+			AciHostContainer:          "noiro/aci-containers-host:6.0.4.1.81c2369",
+			AciOpflexContainer:        "noiro/opflex:6.0.4.1.81c2369",
+			AciMcastContainer:         "noiro/opflex:6.0.4.1.81c2369",
+			AciOpenvSwitchContainer:   "noiro/openvswitch:6.0.4.1.81c2369",
+			AciControllerContainer:    "noiro/aci-containers-controller:6.0.4.1.81c2369",
+			PodInfraContainer:         "rancher/mirrored-pause:3.7",
+			Ingress:                   "rancher/nginx-ingress-controller:nginx-1.9.4-rancher1",
+			IngressBackend:            "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
+			IngressWebhook:            "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231011-8b53cabe0",
+			MetricsServer:             "rancher/mirrored-metrics-server:v0.6.3",
+			CoreDNS:                   "rancher/mirrored-coredns-coredns:1.10.1",
+			CoreDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
+			WindowsPodInfraContainer:  "rancher/mirrored-pause:3.7",
+			Nodelocal:                 "rancher/mirrored-k8s-dns-node-cache:1.22.28",
+		},
 		// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
 		// without all clusters being restarted
 		"v1.11.9-rancher1-3": {

diff --git a/pkg/rke/k8s_version_info.go b/pkg/rke/k8s_version_info.go
@@ -61,7 +61,7 @@ func loadRKEDefaultK8sVersions() map[string]string {
 	return map[string]string{
 		"0.3": "v1.16.3-rancher1-1",
 		// rke will use default if its version is absent
-		"default": "v1.27.12-rancher1-1",
+		"default": "v1.27.13-rancher1-1",
 	}
 }