Merge pull request #1595 from rancher/dev-v2.9

rancher · Jan 21, 2025 · a9b4acb · a9b4acb
2 parents cfce660 + a8d94f3
commit a9b4acb
Show file tree

Hide file tree

Showing 9 changed files with 5,679 additions and 1,513 deletions.
diff --git a/channels-rke2.yaml b/channels-rke2.yaml
@@ -2440,6 +2440,38 @@ releases:
         repo: rancher-rke2-charts
         version: v4.1.301
     featureVersions: *featureVersions-v1
+  - version: v1.29.12+rke2r1
+    minChannelServerVersion: v2.9.0-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v1-28-9-rke2r1
+    agentArgs: *agentArgs-v1-28-8-rke2r1
+    charts: &charts-v1-29-12-rke2r1
+      <<: *charts-v1-29-11-rke2r1
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.16.400
+      rke2-canal:
+        repo: rancher-rke2-charts
+        version: v3.29.1-build2024121100
+      rke2-calico:
+        repo: rancher-rke2-charts
+        version: v3.29.100
+      rke2-calico-crd:
+        repo: rancher-rke2-charts
+        version: v3.29.100
+      rke2-coredns:
+        repo: rancher-rke2-charts
+        version: 1.36.102
+      rke2-ingress-nginx:
+        repo: rancher-rke2-charts
+        version: 4.10.503
+      rke2-flannel:
+        repo: rancher-rke2-charts
+        version: v0.26.101
+      harvester-csi-driver:
+        repo: rancher-rke2-charts
+        version: 0.1.2100
+    featureVersions: *featureVersions-v1
   - version: v1.30.1+rke2r1
     minChannelServerVersion: v2.9.0-alpha1
     maxChannelServerVersion: v2.9.99
@@ -2651,3 +2683,35 @@ releases:
         repo: rancher-rke2-charts
         version: v4.1.301
     featureVersions: *featureVersions-v1
+  - version: v1.30.8+rke2r1
+    minChannelServerVersion: v2.9.0-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v1-28-11-rke2r1
+    agentArgs: *agentArgs-v1-28-11-rke2r1
+    charts: &charts-v1-30-8-rke2r1
+      <<: *charts-v1-30-7-rke2r1
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.16.400
+      rke2-canal:
+        repo: rancher-rke2-charts
+        version: v3.29.1-build2024121100
+      rke2-calico:
+        repo: rancher-rke2-charts
+        version: v3.29.100
+      rke2-calico-crd:
+        repo: rancher-rke2-charts
+        version: v3.29.100
+      rke2-coredns:
+        repo: rancher-rke2-charts
+        version: 1.36.102
+      rke2-ingress-nginx:
+        repo: rancher-rke2-charts
+        version: 4.10.503
+      rke2-flannel:
+        repo: rancher-rke2-charts
+        version: v0.26.101
+      harvester-csi-driver:
+        repo: rancher-rke2-charts
+        version: 0.1.2100
+    featureVersions: *featureVersions-v1
diff --git a/channels.yaml b/channels.yaml
@@ -703,6 +703,17 @@ releases:
     serverArgs: *serverArgs-v9
     agentArgs: *agentArgs-v6
     featureVersions: *featureVersions-v1
+  - version: v1.29.12+k3s1
+    minChannelServerVersion: v2.9.0-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v9
+    agentArgs: &agentArgs-v7
+      <<: *agentArgs-v6
+      node-internal-dns:
+        type: array
+      node-external-dns:
+        type: array
+    featureVersions: *featureVersions-v1
   - version: v1.30.1+k3s1
     minChannelServerVersion: v2.9.0-alpha1
     maxChannelServerVersion: v2.9.99
@@ -745,3 +756,9 @@ releases:
     serverArgs: *serverArgs-v9
     agentArgs: *agentArgs-v6
     featureVersions: *featureVersions-v1
+  - version: v1.30.8+k3s1
+    minChannelServerVersion: v2.9.0-alpha1
+    maxChannelServerVersion: v2.9.99
+    serverArgs: *serverArgs-v9
+    agentArgs: *agentArgs-v7
+    featureVersions: *featureVersions-v1
diff --git a/data/data.json b/data/data.json
diff --git a/pkg/rke/k8s_docker_info.go b/pkg/rke/k8s_docker_info.go
@@ -21,9 +21,9 @@ func loadK8sVersionDockerInfo() map[string][]string {
 		"1.24": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x"},
 		"1.25": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x"},
 		"1.26": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x"},
-		"1.27": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x"},
-		"1.28": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x"},
-		"1.29": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x"},
-		"1.30": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x"},
+		"1.27": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x", "27.3.x", "27.4.x"},
+		"1.28": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x", "27.3.x", "27.4.x"},
+		"1.29": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x", "27.3.x", "27.4.x"},
+		"1.30": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x", "20.10.x", "23.0.x", "24.0.x", "25.0.x", "26.0.x", "26.1.x", "27.0.x", "27.1.x", "27.2.x", "27.3.x", "27.4.x"},
 	}
 }
diff --git a/pkg/rke/k8s_rke_system_images.go b/pkg/rke/k8s_rke_system_images.go
@@ -11024,6 +11024,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.9.6
+		"v1.29.12-rancher1-1": {
+			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.12",
+			Kubernetes:                "rancher/hyperkube:v1.29.12-rancher1",
+			Alpine:                    "rancher/rke-tools:v0.1.108",
+			NginxProxy:                "rancher/rke-tools:v0.1.108",
+			CertDownloader:            "rancher/rke-tools:v0.1.108",
+			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.108",
+			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.25.1",
+			FlannelCNI:                "rancher/flannel-cni:v1.4.1-rancher1",
+			CalicoNode:                "rancher/mirrored-calico-node:v3.27.4",
+			CalicoCNI:                 "rancher/calico-cni:v3.27.4-rancher1",
+			CalicoControllers:         "rancher/mirrored-calico-kube-controllers:v3.27.4",
+			CalicoCtl:                 "rancher/mirrored-calico-ctl:v3.27.4",
+			CalicoFlexVol:             "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.4",
+			CanalNode:                 "rancher/mirrored-calico-node:v3.27.4",
+			CanalCNI:                  "rancher/calico-cni:v3.27.4-rancher1",
+			CanalControllers:          "rancher/mirrored-calico-kube-controllers:v3.27.4",
+			CanalFlannel:              "rancher/mirrored-flannel-flannel:v0.25.1",
+			CanalFlexVol:              "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.4",
+			WeaveNode:                 "weaveworks/weave-kube:2.8.1",
+			WeaveCNI:                  "weaveworks/weave-npc:2.8.1",
+			AciCniDeployContainer:     "noiro/cnideploy:6.1.1.2.81c2369",
+			AciHostContainer:          "noiro/aci-containers-host:6.1.1.2.81c2369",
+			AciOpflexContainer:        "noiro/opflex:6.1.1.2.81c2369",
+			AciMcastContainer:         "noiro/opflex:6.1.1.2.81c2369",
+			AciOpenvSwitchContainer:   "noiro/openvswitch:6.1.1.2.81c2369",
+			AciControllerContainer:    "noiro/aci-containers-controller:6.1.1.2.81c2369",
+			PodInfraContainer:         "rancher/mirrored-pause:3.7",
+			Ingress:                   "rancher/nginx-ingress-controller:nginx-1.11.3-rancher1",
+			IngressBackend:            "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher2",
+			IngressWebhook:            "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v20231226-1a7112e06",
+			MetricsServer:             "rancher/mirrored-metrics-server:v0.7.0",
+			CoreDNS:                   "rancher/mirrored-coredns-coredns:1.11.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",
+		},
 		// Enabled in v2.9.0
 		"v1.30.2-rancher1-1": {
 			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.12",
@@ -11264,6 +11306,46 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			WindowsPodInfraContainer:  "rancher/mirrored-pause:3.7",
 			Nodelocal:                 "rancher/mirrored-k8s-dns-node-cache:1.23.0",
 		},
+		// Enabled in Rancher v2.9.6
+		"v1.30.8-rancher1-1": {
+			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.12",
+			Kubernetes:                "rancher/hyperkube:v1.30.8-rancher1",
+			Alpine:                    "rancher/rke-tools:v0.1.108",
+			NginxProxy:                "rancher/rke-tools:v0.1.108",
+			CertDownloader:            "rancher/rke-tools:v0.1.108",
+			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.108",
+			KubeDNS:                   "rancher/mirrored-k8s-dns-kube-dns:1.23.0",
+			DNSmasq:                   "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.23.0",
+			KubeDNSSidecar:            "rancher/mirrored-k8s-dns-sidecar:1.23.0",
+			KubeDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
+			Flannel:                   "rancher/mirrored-flannel-flannel:v0.25.1",
+			FlannelCNI:                "rancher/flannel-cni:v1.4.1-rancher1",
+			CalicoNode:                "rancher/mirrored-calico-node:v3.28.1",
+			CalicoCNI:                 "rancher/calico-cni:v3.28.1-rancher1",
+			CalicoControllers:         "rancher/mirrored-calico-kube-controllers:v3.28.1",
+			CalicoCtl:                 "rancher/mirrored-calico-ctl:v3.28.1",
+			CalicoFlexVol:             "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.1",
+			CanalNode:                 "rancher/mirrored-calico-node:v3.28.1",
+			CanalCNI:                  "rancher/calico-cni:v3.28.1-rancher1",
+			CanalControllers:          "rancher/mirrored-calico-kube-controllers:v3.28.1",
+			CanalFlannel:              "rancher/mirrored-flannel-flannel:v0.25.1",
+			CanalFlexVol:              "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.1",
+			AciCniDeployContainer:     "noiro/cnideploy:6.1.1.2.81c2369",
+			AciHostContainer:          "noiro/aci-containers-host:6.1.1.2.81c2369",
+			AciOpflexContainer:        "noiro/opflex:6.1.1.2.81c2369",
+			AciMcastContainer:         "noiro/opflex:6.1.1.2.81c2369",
+			AciOpenvSwitchContainer:   "noiro/openvswitch:6.1.1.2.81c2369",
+			AciControllerContainer:    "noiro/aci-containers-controller:6.1.1.2.81c2369",
+			PodInfraContainer:         "rancher/mirrored-pause:3.7",
+			Ingress:                   "rancher/nginx-ingress-controller:nginx-1.11.3-rancher1",
+			IngressBackend:            "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher2",
+			IngressWebhook:            "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.1",
+			MetricsServer:             "rancher/mirrored-metrics-server:v0.7.1",
+			CoreDNS:                   "rancher/mirrored-coredns-coredns:1.11.1",
+			CoreDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
+			WindowsPodInfraContainer:  "rancher/mirrored-pause:3.7",
+			Nodelocal:                 "rancher/mirrored-k8s-dns-node-cache:1.23.0",
+		},
 		// 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
@@ -65,7 +65,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.30.7-rancher1-1",
+		"default": "v1.30.8-rancher1-1",
 	}
 }