Merge pull request #641 from superseb/v26_calico3192

[dev-v2.6] Bump to calico v3.19.2 for 1.21
rancher · Aug 10, 2021 · 47aff81 · 47aff81
2 parents 95c3faa + 2fa28e2
commit 47aff81
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/data/data.json b/data/data.json
@@ -8131,16 +8131,16 @@
    "kubernetes": "rancher/hyperkube:v1.21.3-rancher1",
    "flannel": "rancher/mirrored-coreos-flannel:v0.14.0",
    "flannelCni": "rancher/flannel-cni:v0.3.0-rancher6",
-   "calicoNode": "rancher/mirrored-calico-node:v3.19.1",
-   "calicoCni": "rancher/mirrored-calico-cni:v3.19.1",
-   "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.19.1",
-   "calicoCtl": "rancher/mirrored-calico-ctl:v3.19.1",
-   "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.19.1",
-   "canalNode": "rancher/mirrored-calico-node:v3.19.1",
-   "canalCni": "rancher/mirrored-calico-cni:v3.19.1",
-   "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.19.1",
+   "calicoNode": "rancher/mirrored-calico-node:v3.19.2",
+   "calicoCni": "rancher/mirrored-calico-cni:v3.19.2",
+   "calicoControllers": "rancher/mirrored-calico-kube-controllers:v3.19.2",
+   "calicoCtl": "rancher/mirrored-calico-ctl:v3.19.2",
+   "calicoFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.19.2",
+   "canalNode": "rancher/mirrored-calico-node:v3.19.2",
+   "canalCni": "rancher/mirrored-calico-cni:v3.19.2",
+   "canalControllers": "rancher/mirrored-calico-kube-controllers:v3.19.2",
    "canalFlannel": "rancher/mirrored-coreos-flannel:v0.14.0",
-   "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.19.1",
+   "canalFlexVol": "rancher/mirrored-calico-pod2daemon-flexvol:v3.19.2",
    "weaveNode": "weaveworks/weave-kube:2.8.1",
    "weaveCni": "weaveworks/weave-npc:2.8.1",
    "podInfraContainer": "rancher/mirrored-pause:3.4.1",

diff --git a/rke/k8s_rke_system_images.go b/rke/k8s_rke_system_images.go
@@ -5618,16 +5618,16 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			KubeDNSAutoscaler:         "rancher/mirrored-cluster-proportional-autoscaler:1.8.3",
 			Flannel:                   "rancher/mirrored-coreos-flannel:v0.14.0",
 			FlannelCNI:                "rancher/flannel-cni:v0.3.0-rancher6",
-			CalicoNode:                "rancher/mirrored-calico-node:v3.19.1",
-			CalicoCNI:                 "rancher/mirrored-calico-cni:v3.19.1",
-			CalicoControllers:         "rancher/mirrored-calico-kube-controllers:v3.19.1",
-			CalicoCtl:                 "rancher/mirrored-calico-ctl:v3.19.1",
-			CalicoFlexVol:             "rancher/mirrored-calico-pod2daemon-flexvol:v3.19.1",
-			CanalNode:                 "rancher/mirrored-calico-node:v3.19.1",
-			CanalCNI:                  "rancher/mirrored-calico-cni:v3.19.1",
-			CanalControllers:          "rancher/mirrored-calico-kube-controllers:v3.19.1",
+			CalicoNode:                "rancher/mirrored-calico-node:v3.19.2",
+			CalicoCNI:                 "rancher/mirrored-calico-cni:v3.19.2",
+			CalicoControllers:         "rancher/mirrored-calico-kube-controllers:v3.19.2",
+			CalicoCtl:                 "rancher/mirrored-calico-ctl:v3.19.2",
+			CalicoFlexVol:             "rancher/mirrored-calico-pod2daemon-flexvol:v3.19.2",
+			CanalNode:                 "rancher/mirrored-calico-node:v3.19.2",
+			CanalCNI:                  "rancher/mirrored-calico-cni:v3.19.2",
+			CanalControllers:          "rancher/mirrored-calico-kube-controllers:v3.19.2",
 			CanalFlannel:              "rancher/mirrored-coreos-flannel:v0.14.0",
-			CanalFlexVol:              "rancher/mirrored-calico-pod2daemon-flexvol:v3.19.1",
+			CanalFlexVol:              "rancher/mirrored-calico-pod2daemon-flexvol:v3.19.2",
 			WeaveNode:                 "weaveworks/weave-kube:2.8.1",
 			WeaveCNI:                  "weaveworks/weave-npc:2.8.1",
 			AciCniDeployContainer:     "noiro/cnideploy:5.1.1.0.1ae238a",