Skip to content

Commit

Permalink
Merge pull request #1585 from noironetworks/aci-6112-dev-v2.10
Browse files Browse the repository at this point in the history 
[dev-v2.10] Add ACI-CNI 6.1.1.2 template
  • Loading branch information
@mitulshah-suse
mitulshah-suse authored Jan 6, 2025
2 parents dfb4a2e + 03daf37 commit d3db5d4
Show file tree
Hide file tree
Showing 4 changed files with 2,894 additions and 42 deletions.
46 changes: 25 additions & 21 deletions data/data.json
View file

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions pkg/rke/k8s_rke_system_images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11050,12 +11050,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.4.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.0.4.4.81c2369",
AciOpflexContainer: "noiro/opflex:6.0.4.4.81c2369",
AciMcastContainer: "noiro/opflex:6.0.4.4.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.4.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.4.81c2369",
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",
Expand Down Expand Up @@ -11330,12 +11330,12 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
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.0.4.4.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.0.4.4.81c2369",
AciOpflexContainer: "noiro/opflex:6.0.4.4.81c2369",
AciMcastContainer: "noiro/opflex:6.0.4.4.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.4.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.4.81c2369",
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",
Expand Down Expand Up @@ -11450,12 +11450,12 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CanalControllers: "rancher/mirrored-calico-kube-controllers:v3.29.0",
CanalFlannel: "rancher/mirrored-flannel-flannel:v0.25.1",
CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.29.0",
AciCniDeployContainer: "noiro/cnideploy:6.0.4.4.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.0.4.4.81c2369",
AciOpflexContainer: "noiro/opflex:6.0.4.4.81c2369",
AciMcastContainer: "noiro/opflex:6.0.4.4.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.4.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.4.81c2369",
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",
Expand Down
Loading

0 comments on commit d3db5d4

Please sign in to comment.