Merge pull request #1006 from rancher/dev-v2.6-0922-patches

rancher · Nov 11, 2022 · 9b9da1d · 9b9da1d
2 parents 577a661 + ddcb331
commit 9b9da1d
Show file tree

Hide file tree

Showing 7 changed files with 2,273 additions and 406 deletions.
diff --git a/channels-rke2.yaml b/channels-rke2.yaml
@@ -1,6 +1,6 @@
 channels:
   - name: default
-    latest: v1.22.13+rke2r1
+    latest: v1.22.15+rke2r2
 appDefaults:
   - appName: rancher
     defaults:
@@ -598,11 +598,11 @@ releases:
   - version: v1.22.13+rke2r1
     minChannelServerVersion: v2.6.3-alpha1
     maxChannelServerVersion: v2.6.99
-    serverArgs: &serverArgs-v1
+    serverArgs: &serverArgs-v1-22-13-rke2r1
       <<: *serverArgs-v1-22-11-rke2r1
-    agentArgs: &agentArgs-v1
+    agentArgs: &agentArgs-v1-22-13-rke2r1
       <<: *agentArgs-v1-22-11-rke2r1
-    charts: &charts-v1
+    charts: &charts-v1-22-13-rke2r1
       <<: *charts-v1-22-11-rke2r1
       rke2-cilium:
         repo: rancher-rke2-charts
@@ -615,6 +615,22 @@ releases:
         version: 0.1.1300
     featureVersions: &featureVersions-v1
       <<: *featureVersions-v1-22-11-rke2r1
+  - version: v1.22.15+rke2r2
+    minChannelServerVersion: v2.6.3-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: &serverArgs-v1-22-15-rke2r2
+      <<: *serverArgs-v1-22-13-rke2r1
+    agentArgs: &agentArgs-v1-22-15-rke2r2
+      <<: *agentArgs-v1-22-13-rke2r1
+    charts: &charts-v1-22-15-rke2r2
+      <<: *charts-v1-22-13-rke2r1
+      rke2-canal:
+        repo: rancher-rke2-charts
+        version: v3.24.1-build2022101102
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.12.102
+    featureVersions: *featureVersions-v1
   - version: v1.23.4+rke2r2
     minChannelServerVersion: v2.6.4-alpha1
     maxChannelServerVersion: v2.6.99
@@ -733,16 +749,65 @@ releases:
   - version: v1.23.10+rke2r1
     minChannelServerVersion: v2.6.4-alpha1
     maxChannelServerVersion: v2.6.99
-    serverArgs: *serverArgs-v1
-    agentArgs: *agentArgs-v1
-    charts: &charts-v2
-      <<: *charts-v1
+    serverArgs: &serverArgs-v1-23-10-rke2r1
+      <<: *serverArgs-v1-23-8-rke2r1
+    agentArgs: &agentArgs-v1-23-10-rke2r1
+      <<: *agentArgs-v1-23-8-rke2r1
+    charts: &charts-v1-23-10-rke2r1
+      <<: *charts-v1-23-8-rke2r1
       rke2-calico:
         repo: rancher-rke2-charts
         version: v3.23.103
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.12.001
       rke2-calico-crd:
         repo: rancher-rke2-charts
         version: v3.23.103
+      rke2-ingress-nginx:
+        repo: rancher-rke2-charts
+        version: 4.1.004
+      harvester-cloud-provider:
+        repo: rancher-rke2-charts
+        version: 0.1.1300
+    featureVersions: *featureVersions-v1
+  - version: v1.23.13+rke2r1
+    minChannelServerVersion: v2.6.4-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: *serverArgs-v1-23-8-rke2r1
+    agentArgs: *agentArgs-v1-23-8-rke2r1
+    charts: &charts-v1-23-13-rke2r1
+      <<: *charts-v1-22-13-rke2r1
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.12.102
+      rke2-coredns:
+        repo: rancher-rke2-charts
+        version: 1.19.401
+      rke2-canal:
+        repo: rancher-rke2-charts
+        version: v3.24.1-build2022101103
+      rke2-ingress-nginx:
+        repo: rancher-rke2-charts
+        version: 4.1.005
+      rke2-metrics-server:
+        repo: rancher-rke2-charts
+        version: 2.11.100-build2022101106
+      rke2-multus:
+        repo: rancher-rke2-charts
+        version: v3.8-build2022101103
+      rancher-vsphere-cpi:
+        repo: rancher-charts
+        version: 1.4.001
+      rancher-vsphere-csi:
+        repo: rancher-rke2-charts
+        version: 2.6.1-rancher101
+      rke2-calico:
+        repo: rancher-rke2-charts
+        version: v3.24.102
+      rke2-calico-crd:
+        repo: rancher-rke2-charts
+        version: v3.24.102
     featureVersions: *featureVersions-v1
   - version: v1.24.2+rke2r1
     minChannelServerVersion: v2.6.7-alpha1
@@ -758,7 +823,60 @@ releases:
   - version: v1.24.4+rke2r1
     minChannelServerVersion: v2.6.7-alpha1
     maxChannelServerVersion: v2.6.99
-    serverArgs: *serverArgs-v1
-    agentArgs: *agentArgs-v1
-    charts: *charts-v2
-    featureVersions: *featureVersions-v1
+    serverArgs: &serverArgs-v1-24-4-rke2r1
+      <<: *serverArgs-v1-24-2-rke2r1
+    agentArgs: &agentArgs-v1-24-4-rke2r1
+      <<: *agentArgs-v1-24-2-rke2r1
+    charts: &charts-v1-24-4-rke2r1
+      <<: *charts-v1-24-2-rke2r1
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.12.001
+      rke2-coredns:
+        repo: rancher-rke2-charts
+        version: 1.19.400
+      rke2-ingress-nginx:
+        repo: rancher-rke2-charts
+        version: 4.1.004
+      harvester-cloud-provider:
+        repo: rancher-rke2-charts
+        version: 0.1.1300
+    featureVersions: *featureVersions-v1
+  - version: v1.24.7+rke2r1
+    minChannelServerVersion: v2.6.7-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: *serverArgs-v1-24-2-rke2r1
+    agentArgs: *agentArgs-v1-24-2-rke2r1
+    charts: &charts-v1-24-7-rke2r1
+      <<: *charts-v1-23-10-rke2r1
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.12.102
+      rke2-coredns:
+        repo: rancher-rke2-charts
+        version: 1.19.401
+      rke2-canal:
+        repo: rancher-rke2-charts
+        version: v3.24.1-build2022101103
+      rke2-ingress-nginx:
+        repo: rancher-rke2-charts
+        version: 4.1.005
+      rke2-metrics-server:
+        repo: rancher-rke2-charts
+        version: 2.11.100-build2022101106
+      rke2-multus:
+        repo: rancher-rke2-charts
+        version: v3.8-build2022101103
+      rancher-vsphere-cpi:
+        repo: rancher-charts
+        version: 1.4.001
+      rancher-vsphere-csi:
+        repo: rancher-rke2-charts
+        version: 2.6.1-rancher101
+      rke2-calico:
+        repo: rancher-rke2-charts
+        version: v3.24.102
+      rke2-calico-crd:
+        repo: rancher-rke2-charts
+        version: v3.24.102
+    featureVersions: *featureVersions-v1
diff --git a/channels.yaml b/channels.yaml
@@ -1,6 +1,6 @@
 channels:
   - name: default
-    latest: v1.22.11+k3s2
+    latest: v1.22.15+k3s1
 appDefaults:
   - appName: rancher
     defaults:
@@ -227,6 +227,13 @@ releases:
     serverArgs: *serverArgs-v3
     agentArgs: *agentArgs-v2
     featureVersions: *featureVersions-v1
+  # v1.22.14+k3s1 was never released
+  - version: v1.22.15+k3s1
+    minChannelServerVersion: v2.6.3-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: *serverArgs-v3
+    agentArgs: *agentArgs-v2
+    featureVersions: *featureVersions-v1
   - version: v1.23.4+k3s1
     minChannelServerVersion: v2.6.4-alpha1
     maxChannelServerVersion: v2.6.99
@@ -256,6 +263,14 @@ releases:
     serverArgs: *serverArgs-v3
     agentArgs: *agentArgs-v2
     featureVersions: *featureVersions-v1
+  #  v1.23.11+k3s1 was never released
+  #  v1.23.12+k3s1 was never released through KDM 
+  - version: v1.23.13+k3s1
+    minChannelServerVersion: v2.6.4-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: *serverArgs-v3
+    agentArgs: *agentArgs-v2
+    featureVersions: *featureVersions-v1
   - version: v1.24.2+k3s2
     minChannelServerVersion: v2.6.7-alpha1
     maxChannelServerVersion: v2.6.99
@@ -268,3 +283,11 @@ releases:
     serverArgs: *serverArgs-v3
     agentArgs: *agentArgs-v2
     featureVersions: *featureVersions-v1
+  #  v1.24.5+k3s1 was never released
+  #  v1.24.6+k3s1 was never released through KDM
+  - version: v1.24.7+k3s1
+    minChannelServerVersion: v2.6.7-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: *serverArgs-v3
+    agentArgs: *agentArgs-v2
+    featureVersions: *featureVersions-v1
diff --git a/data/data.json b/data/data.json
diff --git a/rke/k8s_rke_system_images.go b/rke/k8s_rke_system_images.go
@@ -7758,6 +7758,50 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			WindowsPodInfraContainer:  "rancher/mirrored-pause:3.6",
 			Nodelocal:                 "rancher/mirrored-k8s-dns-node-cache:1.21.1",
 		},
+		// Enabled OOB post Rancher v2.6.9
+		"v1.22.15-rancher1-1": {
+			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.3",
+			Kubernetes:                "rancher/hyperkube:v1.22.15-rancher1",
+			Alpine:                    "rancher/rke-tools:v0.1.87",
+			NginxProxy:                "rancher/rke-tools:v0.1.87",
+			CertDownloader:            "rancher/rke-tools:v0.1.87",
+			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.87",
+			KubeDNS:                   "rancher/mirrored-k8s-dns-kube-dns:1.17.4",
+			DNSmasq:                   "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.17.4",
+			KubeDNSSidecar:            "rancher/mirrored-k8s-dns-sidecar:1.17.4",
+			KubeDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:1.8.3",
+			Flannel:                   "rancher/mirrored-coreos-flannel:v0.15.1",
+			FlannelCNI:                "rancher/flannel-cni:v0.3.0-rancher6",
+			CalicoNode:                "rancher/mirrored-calico-node:v3.21.1",
+			CalicoCNI:                 "rancher/calico-cni:v3.21.3-rancher1",
+			CalicoControllers:         "rancher/mirrored-calico-kube-controllers:v3.21.1",
+			CalicoCtl:                 "rancher/mirrored-calico-ctl:v3.21.1",
+			CalicoFlexVol:             "rancher/mirrored-calico-pod2daemon-flexvol:v3.21.1",
+			CanalNode:                 "rancher/mirrored-calico-node:v3.21.1",
+			CanalCNI:                  "rancher/calico-cni:v3.21.3-rancher1",
+			CanalControllers:          "rancher/mirrored-calico-kube-controllers:v3.21.1",
+			CanalFlannel:              "rancher/mirrored-flannelcni-flannel:v0.17.0",
+			CanalFlexVol:              "rancher/mirrored-calico-pod2daemon-flexvol:v3.21.1",
+			WeaveNode:                 "weaveworks/weave-kube:2.8.1",
+			WeaveCNI:                  "weaveworks/weave-npc:2.8.1",
+			AciCniDeployContainer:     "noiro/cnideploy:5.2.3.2.1d150da",
+			AciHostContainer:          "noiro/aci-containers-host:5.2.3.2.1d150da",
+			AciOpflexContainer:        "noiro/opflex:5.2.3.2.1d150da",
+			AciMcastContainer:         "noiro/opflex:5.2.3.2.1d150da",
+			AciOpenvSwitchContainer:   "noiro/openvswitch:5.2.3.2.1d150da",
+			AciControllerContainer:    "noiro/aci-containers-controller:5.2.3.2.1d150da",
+			AciGbpServerContainer:     "noiro/gbp-server:5.2.3.2.1d150da",
+			AciOpflexServerContainer:  "noiro/opflex-server:5.2.3.2.1d150da",
+			PodInfraContainer:         "rancher/mirrored-pause:3.6",
+			Ingress:                   "rancher/nginx-ingress-controller:nginx-1.2.1-rancher1",
+			IngressBackend:            "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
+			IngressWebhook:            "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.1.1",
+			MetricsServer:             "rancher/mirrored-metrics-server:v0.5.2",
+			CoreDNS:                   "rancher/mirrored-coredns-coredns:1.8.6",
+			CoreDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:1.8.5",
+			WindowsPodInfraContainer:  "rancher/mirrored-pause:3.6",
+			Nodelocal:                 "rancher/mirrored-k8s-dns-node-cache:1.21.1",
+		},
 		// Enabled in v2.6.4
 		"v1.23.4-rancher1-1": {
 			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.2",
@@ -8022,6 +8066,50 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			WindowsPodInfraContainer:  "rancher/mirrored-pause:3.6",
 			Nodelocal:                 "rancher/mirrored-k8s-dns-node-cache:1.21.1",
 		},
+		// Enabled OOB post Rancher v2.6.9
+		"v1.23.12-rancher1-1": {
+			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.3",
+			Kubernetes:                "rancher/hyperkube:v1.23.12-rancher1",
+			Alpine:                    "rancher/rke-tools:v0.1.87",
+			NginxProxy:                "rancher/rke-tools:v0.1.87",
+			CertDownloader:            "rancher/rke-tools:v0.1.87",
+			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.87",
+			KubeDNS:                   "rancher/mirrored-k8s-dns-kube-dns:1.21.1",
+			DNSmasq:                   "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.21.1",
+			KubeDNSSidecar:            "rancher/mirrored-k8s-dns-sidecar:1.21.1",
+			KubeDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:1.8.5",
+			Flannel:                   "rancher/mirrored-coreos-flannel:v0.15.1",
+			FlannelCNI:                "rancher/flannel-cni:v0.3.0-rancher6",
+			CalicoNode:                "rancher/mirrored-calico-node:v3.22.0",
+			CalicoCNI:                 "rancher/calico-cni:v3.22.0-rancher1",
+			CalicoControllers:         "rancher/mirrored-calico-kube-controllers:v3.22.0",
+			CalicoCtl:                 "rancher/mirrored-calico-ctl:v3.22.0",
+			CalicoFlexVol:             "rancher/mirrored-calico-pod2daemon-flexvol:v3.22.0",
+			CanalNode:                 "rancher/mirrored-calico-node:v3.22.0",
+			CanalCNI:                  "rancher/calico-cni:v3.22.0-rancher1",
+			CanalControllers:          "rancher/mirrored-calico-kube-controllers:v3.22.0",
+			CanalFlannel:              "rancher/mirrored-flannelcni-flannel:v0.17.0",
+			CanalFlexVol:              "rancher/mirrored-calico-pod2daemon-flexvol:v3.22.0",
+			WeaveNode:                 "weaveworks/weave-kube:2.8.1",
+			WeaveCNI:                  "weaveworks/weave-npc:2.8.1",
+			AciCniDeployContainer:     "noiro/cnideploy:5.2.3.2.1d150da",
+			AciHostContainer:          "noiro/aci-containers-host:5.2.3.2.1d150da",
+			AciOpflexContainer:        "noiro/opflex:5.2.3.2.1d150da",
+			AciMcastContainer:         "noiro/opflex:5.2.3.2.1d150da",
+			AciOpenvSwitchContainer:   "noiro/openvswitch:5.2.3.2.1d150da",
+			AciControllerContainer:    "noiro/aci-containers-controller:5.2.3.2.1d150da",
+			AciGbpServerContainer:     "noiro/gbp-server:5.2.3.2.1d150da",
+			AciOpflexServerContainer:  "noiro/opflex-server:5.2.3.2.1d150da",
+			PodInfraContainer:         "rancher/mirrored-pause:3.6",
+			Ingress:                   "rancher/nginx-ingress-controller:nginx-1.2.1-rancher1",
+			IngressBackend:            "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
+			IngressWebhook:            "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.1.1",
+			MetricsServer:             "rancher/mirrored-metrics-server:v0.6.1",
+			CoreDNS:                   "rancher/mirrored-coredns-coredns:1.9.0",
+			CoreDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:1.8.5",
+			WindowsPodInfraContainer:  "rancher/mirrored-pause:3.6",
+			Nodelocal:                 "rancher/mirrored-k8s-dns-node-cache:1.21.1",
+		},
 		// Enabled with 2.6.7
 		"v1.24.2-rancher1-1": {
 			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.4",
@@ -8110,6 +8198,50 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			WindowsPodInfraContainer:  "rancher/mirrored-pause:3.6",
 			Nodelocal:                 "rancher/mirrored-k8s-dns-node-cache:1.21.1",
 		},
+		// Enabled OOB post Rancher v2.6.9
+		"v1.24.6-rancher1-1": {
+			Etcd:                      "rancher/mirrored-coreos-etcd:v3.5.4",
+			Kubernetes:                "rancher/hyperkube:v1.24.6-rancher1",
+			Alpine:                    "rancher/rke-tools:v0.1.87",
+			NginxProxy:                "rancher/rke-tools:v0.1.87",
+			CertDownloader:            "rancher/rke-tools:v0.1.87",
+			KubernetesServicesSidecar: "rancher/rke-tools:v0.1.87",
+			KubeDNS:                   "rancher/mirrored-k8s-dns-kube-dns:1.21.1",
+			DNSmasq:                   "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.21.1",
+			KubeDNSSidecar:            "rancher/mirrored-k8s-dns-sidecar:1.21.1",
+			KubeDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:1.8.5",
+			Flannel:                   "rancher/mirrored-coreos-flannel:v0.15.1",
+			FlannelCNI:                "rancher/flannel-cni:v0.3.0-rancher6",
+			CalicoNode:                "rancher/mirrored-calico-node:v3.22.0",
+			CalicoCNI:                 "rancher/calico-cni:v3.22.0-rancher1",
+			CalicoControllers:         "rancher/mirrored-calico-kube-controllers:v3.22.0",
+			CalicoCtl:                 "rancher/mirrored-calico-ctl:v3.22.0",
+			CalicoFlexVol:             "rancher/mirrored-calico-pod2daemon-flexvol:v3.22.0",
+			CanalNode:                 "rancher/mirrored-calico-node:v3.22.0",
+			CanalCNI:                  "rancher/calico-cni:v3.22.0-rancher1",
+			CanalControllers:          "rancher/mirrored-calico-kube-controllers:v3.22.0",
+			CanalFlannel:              "rancher/mirrored-flannelcni-flannel:v0.17.0",
+			CanalFlexVol:              "rancher/mirrored-calico-pod2daemon-flexvol:v3.22.0",
+			WeaveNode:                 "weaveworks/weave-kube:2.8.1",
+			WeaveCNI:                  "weaveworks/weave-npc:2.8.1",
+			AciCniDeployContainer:     "noiro/cnideploy:5.2.3.2.1d150da",
+			AciHostContainer:          "noiro/aci-containers-host:5.2.3.2.1d150da",
+			AciOpflexContainer:        "noiro/opflex:5.2.3.2.1d150da",
+			AciMcastContainer:         "noiro/opflex:5.2.3.2.1d150da",
+			AciOpenvSwitchContainer:   "noiro/openvswitch:5.2.3.2.1d150da",
+			AciControllerContainer:    "noiro/aci-containers-controller:5.2.3.2.1d150da",
+			AciGbpServerContainer:     "noiro/gbp-server:5.2.3.2.1d150da",
+			AciOpflexServerContainer:  "noiro/opflex-server:5.2.3.2.1d150da",
+			PodInfraContainer:         "rancher/mirrored-pause:3.6",
+			Ingress:                   "rancher/nginx-ingress-controller:nginx-1.2.1-rancher1",
+			IngressBackend:            "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
+			IngressWebhook:            "rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.1.1",
+			MetricsServer:             "rancher/mirrored-metrics-server:v0.6.1",
+			CoreDNS:                   "rancher/mirrored-coredns-coredns:1.9.3",
+			CoreDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:1.8.5",
+			WindowsPodInfraContainer:  "rancher/mirrored-pause:3.6",
+			Nodelocal:                 "rancher/mirrored-k8s-dns-node-cache:1.21.1",
+		},
 		// 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": {