Merge pull request #1425 from vardhaman22/remove-weave-images

[dev-v2.9] removed weave images for k8s 1.30
rancher · Jul 3, 2024 · fbead82 · fbead82
2 parents 59d2311 + 3d01e37
commit fbead82
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/data/data.json b/data/data.json
@@ -13724,8 +13724,6 @@
    "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.28.0",
    "canalFlannel": "rancher/mirrored-flannel-flannel:v0.25.1",
    "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.0",
-   "weaveNode": "weaveworks/weave-kube:2.8.1",
-   "weaveCni": "weaveworks/weave-npc:2.8.1",
    "podInfraContainer": "rancher/mirrored-pause:3.7",
    "ingress": "rancher/nginx-ingress-controller:nginx-1.10.1-rancher1",
    "ingressBackend": "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",

diff --git a/pkg/rke/k8s_rke_system_images.go b/pkg/rke/k8s_rke_system_images.go
@@ -10628,8 +10628,6 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			CanalControllers:          "rancher/mirrored-calico-kube-controllers:v3.28.0",
 			CanalFlannel:              "rancher/mirrored-flannel-flannel:v0.25.1",
 			CanalFlexVol:              "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.0",
-			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",