Skip to content

Commit

Permalink
Merge pull request #1488 from rancher/revert-1484-v2.9-calico
Browse files Browse the repository at this point in the history
  • Loading branch information
@chiukapoor
chiukapoor authored Sep 10, 2024
2 parents e6b19c7 + fbbdb24 commit 0c9e776
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 20,906 deletions.
76 changes: 33 additions & 43 deletions data/data.json
View file

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions pkg/rke/k8s_rke_system_images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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",
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",
CanalFlannel: "rancher/mirrored-flannel-flannel:v0.24.2",
CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.4",
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.2.81c2369",
Expand Down Expand Up @@ -10786,16 +10786,16 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
KubeDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
Flannel: "rancher/mirrored-flannel-flannel:v0.25.1",
FlannelCNI: "rancher/flannel-cni:v1.4.1-rancher1",
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",
CalicoNode: "rancher/mirrored-calico-node:v3.27.3",
CalicoCNI: "rancher/calico-cni:v3.27.3-rancher1",
CalicoControllers: "rancher/mirrored-calico-kube-controllers:v3.27.3",
CalicoCtl: "rancher/mirrored-calico-ctl:v3.27.3",
CalicoFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.3",
CanalNode: "rancher/mirrored-calico-node:v3.27.3",
CanalCNI: "rancher/calico-cni:v3.27.3-rancher1",
CanalControllers: "rancher/mirrored-calico-kube-controllers:v3.27.3",
CanalFlannel: "rancher/mirrored-flannel-flannel:v0.25.1",
CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.27.4",
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.2.81c2369",
Expand Down Expand Up @@ -10908,16 +10908,16 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
KubeDNSAutoscaler: "rancher/mirrored-cluster-proportional-autoscaler:v1.8.9",
Flannel: "rancher/mirrored-flannel-flannel:v0.25.1",
FlannelCNI: "rancher/flannel-cni:v1.4.1-rancher1",
CalicoNode: "rancher/mirrored-calico-node:v3.28.1",
CalicoCNI: "rancher/calico-cni:v3.28.1-rancher1",
CalicoControllers: "rancher/mirrored-calico-kube-controllers:v3.28.1",
CalicoCtl: "rancher/mirrored-calico-ctl:v3.28.1",
CalicoFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.1",
CanalNode: "rancher/mirrored-calico-node:v3.28.1",
CanalCNI: "rancher/calico-cni:v3.28.1-rancher1",
CanalControllers: "rancher/mirrored-calico-kube-controllers:v3.28.1",
CalicoNode: "rancher/mirrored-calico-node:v3.28.0",
CalicoCNI: "rancher/calico-cni:v3.28.0-rancher1",
CalicoControllers: "rancher/mirrored-calico-kube-controllers:v3.28.0",
CalicoCtl: "rancher/mirrored-calico-ctl:v3.28.0",
CalicoFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.0",
CanalNode: "rancher/mirrored-calico-node:v3.28.0",
CanalCNI: "rancher/calico-cni:v3.28.0-rancher1",
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.1",
CanalFlexVol: "rancher/mirrored-calico-pod2daemon-flexvol:v3.28.0",
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",
Expand Down
Loading

0 comments on commit 0c9e776

Please sign in to comment.