Merge pull request #1485 from chiukapoor/v2.8-calico

[v2.8] Add calico and canal to `v3.27.4` and `v3.28.1`
rancher · Sep 9, 2024 · a65f9a1 · a65f9a1
2 parents 228c965 + 131577d
commit a65f9a1
Show file tree

Hide file tree

Showing 7 changed files with 10,422 additions and 25 deletions.
diff --git a/data/data.json b/data/data.json
diff --git a/pkg/rke/k8s_rke_system_images.go b/pkg/rke/k8s_rke_system_images.go
@@ -10660,16 +10660,16 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			KubeDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
 			Flannel:                   "rancher/mirrored-flannel-flannel:v0.24.2",
 			FlannelCNI:                "rancher/flannel-cni:v0.3.0-rancher9",
-			CalicoNode:                "rancher/mirrored-calico-node:v3.27.0",
-			CalicoCNI:                 "rancher/calico-cni:v3.27.0-rancher1",
-			CalicoControllers:         "rancher/mirrored-calico-kube-controllers:v3.27.0",
-			CalicoCtl:                 "rancher/mirrored-calico-ctl:v3.27.0",
-			CalicoFlexVol:             "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.0",
-			CanalNode:                 "rancher/mirrored-calico-node:v3.27.0",
-			CanalCNI:                  "rancher/calico-cni:v3.27.0-rancher1",
-			CanalControllers:          "rancher/mirrored-calico-kube-controllers:v3.27.0",
+			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.24.2",
-			CanalFlexVol:              "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.0",
+			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.0.4.2.81c2369",