Skip to content

Commit

Permalink
Merge pull request rancher#1431 from noironetworks/aci-6042-dev-2.9
Browse files Browse the repository at this point in the history 
[v2.9] Add ACI-CNI 6.0.4.2 template
  • Loading branch information
@kinarashah
kinarashah authored Jul 5, 2024
2 parents 4528ca2 + 18acdeb commit a65c3ab
Show file tree
Hide file tree
Showing 4 changed files with 2,756 additions and 86 deletions.
56 changes: 30 additions & 26 deletions data/data.json
View file

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions pkg/rke/k8s_rke_system_images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10336,12 +10336,12 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3",
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",
AciMcastContainer: "noiro/opflex:6.0.4.1.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.1.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.1.81c2369",
AciCniDeployContainer: "noiro/cnideploy:6.0.4.2.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.0.4.2.81c2369",
AciOpflexContainer: "noiro/opflex:6.0.4.2.81c2369",
AciMcastContainer: "noiro/opflex:6.0.4.2.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.2.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.2.81c2369",
PodInfraContainer: "rancher/mirrored-pause:3.7",
Ingress: "rancher/nginx-ingress-controller:nginx-1.9.4-rancher1",
IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
Expand Down Expand Up @@ -10546,12 +10546,12 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.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",
AciMcastContainer: "noiro/opflex:6.0.4.1.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.1.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.1.81c2369",
AciCniDeployContainer: "noiro/cnideploy:6.0.4.2.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.0.4.2.81c2369",
AciOpflexContainer: "noiro/opflex:6.0.4.2.81c2369",
AciMcastContainer: "noiro/opflex:6.0.4.2.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.2.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.2.81c2369",
PodInfraContainer: "rancher/mirrored-pause:3.7",
Ingress: "rancher/nginx-ingress-controller:nginx-1.9.6-rancher1",
IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
Expand Down Expand Up @@ -10588,12 +10588,12 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.3",
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",
AciMcastContainer: "noiro/opflex:6.0.4.1.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.1.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.1.81c2369",
AciCniDeployContainer: "noiro/cnideploy:6.0.4.2.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.0.4.2.81c2369",
AciOpflexContainer: "noiro/opflex:6.0.4.2.81c2369",
AciMcastContainer: "noiro/opflex:6.0.4.2.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.2.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.2.81c2369",
PodInfraContainer: "rancher/mirrored-pause:3.7",
Ingress: "rancher/nginx-ingress-controller:nginx-1.9.6-rancher1",
IngressBackend: "rancher/mirrored-nginx-ingress-controller-defaultbackend:1.5-rancher1",
Expand Down Expand Up @@ -10628,12 +10628,12 @@ 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",
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",
AciMcastContainer: "noiro/opflex:6.0.4.1.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.1.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.1.81c2369",
AciCniDeployContainer: "noiro/cnideploy:6.0.4.2.81c2369",
AciHostContainer: "noiro/aci-containers-host:6.0.4.2.81c2369",
AciOpflexContainer: "noiro/opflex:6.0.4.2.81c2369",
AciMcastContainer: "noiro/opflex:6.0.4.2.81c2369",
AciOpenvSwitchContainer: "noiro/openvswitch:6.0.4.2.81c2369",
AciControllerContainer: "noiro/aci-containers-controller:6.0.4.2.81c2369",
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",
Expand Down
Loading

0 comments on commit a65c3ab

Please sign in to comment.