Merge pull request #5028 from thomasferrandiz/backport-1.25-calico-3.…

…6.23 [backport 1.25] update calico to v3.26.3
rancher · Nov 16, 2023 · 55cbb1b · 55cbb1b
2 parents f69d249 + fc7ee59
commit 55cbb1b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
@@ -5,10 +5,10 @@ charts:
   - version: v3.26.3-build2023110900
     filename: /charts/rke2-canal.yaml
     bootstrap: true
-  - version: v3.26.101
+  - version: v3.26.300
     filename: /charts/rke2-calico.yaml
     bootstrap: true
-  - version: v3.26.101
+  - version: v3.26.300
     filename: /charts/rke2-calico-crd.yaml
     bootstrap: true
   - version: 1.24.006

diff --git a/scripts/build-images b/scripts/build-images
@@ -51,14 +51,14 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt
 EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt
-    ${REGISTRY}/rancher/mirrored-calico-operator:v1.30.4
-    ${REGISTRY}/rancher/mirrored-calico-ctl:v3.26.1
-    ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.26.1
-    ${REGISTRY}/rancher/mirrored-calico-typha:v3.26.1
-    ${REGISTRY}/rancher/mirrored-calico-node:v3.26.1
-    ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.26.1
-    ${REGISTRY}/rancher/mirrored-calico-cni:v3.26.1
-    ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.26.1
+    ${REGISTRY}/rancher/mirrored-calico-operator:v1.30.7
+    ${REGISTRY}/rancher/mirrored-calico-ctl:v3.26.3
+    ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.26.3
+    ${REGISTRY}/rancher/mirrored-calico-typha:v3.26.3
+    ${REGISTRY}/rancher/mirrored-calico-node:v3.26.3
+    ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.26.3
+    ${REGISTRY}/rancher/mirrored-calico-cni:v3.26.3
+    ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.26.3
 EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt