Merge pull request #1510 from noironetworks/aci-6111-v2.8

[v2.8] Add ACI CNI 6.1.1.1 template changes
rancher · Oct 4, 2024 · b192450 · b192450
2 parents 54ddb7f + 7f6f00e
commit b192450
Show file tree

Hide file tree

Showing 4 changed files with 2,819 additions and 53 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
@@ -10714,12 +10714,12 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			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.3.81c2369",
-			AciHostContainer:          "noiro/aci-containers-host:6.0.4.3.81c2369",
-			AciOpflexContainer:        "noiro/opflex:6.0.4.3.81c2369",
-			AciMcastContainer:         "noiro/opflex:6.0.4.3.81c2369",
-			AciOpenvSwitchContainer:   "noiro/openvswitch:6.0.4.3.81c2369",
-			AciControllerContainer:    "noiro/aci-containers-controller:6.0.4.3.81c2369",
+			AciCniDeployContainer:     "noiro/cnideploy:6.1.1.1.81c2369",
+			AciHostContainer:          "noiro/aci-containers-host:6.1.1.1.81c2369",
+			AciOpflexContainer:        "noiro/opflex:6.1.1.1.81c2369",
+			AciMcastContainer:         "noiro/opflex:6.1.1.1.81c2369",
+			AciOpenvSwitchContainer:   "noiro/openvswitch:6.1.1.1.81c2369",
+			AciControllerContainer:    "noiro/aci-containers-controller:6.1.1.1.81c2369",
 			PodInfraContainer:         "rancher/mirrored-pause:3.7",
 			Ingress:                   "rancher/nginx-ingress-controller:nginx-1.11.2-rancher1",
 			IngressBackend:            "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",