Merge pull request #7724 from mgfritch/bump-calico-v3.29.2-release-1.31

[release-1.31] Update Calico and Canal to v3.29.2
rancher · Feb 7, 2025 · 5eb2458 · 5eb2458
2 parents 4423501 + d880485
commit 5eb2458
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -44,7 +44,7 @@ ARG KUBERNETES_VERSION=dev
 
 # windows runtime image
 ENV CRICTL_VERSION="v1.30.1"
-ENV CALICO_VERSION="v3.29.1"
+ENV CALICO_VERSION="v3.29.2"
 ENV CNI_PLUGIN_VERSION="v1.6.2"
 ENV FLANNEL_VERSION="v0.26.4"
 ENV CNI_FLANNEL_VERSION="v1.6.2-flannel1"

diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
@@ -2,10 +2,10 @@ charts:
   - version: 1.17.000
     filename: /charts/rke2-cilium.yaml
     bootstrap: true
-  - version: v3.29.1-build2025020600
+  - version: v3.29.2-build2025020600
     filename: /charts/rke2-canal.yaml
     bootstrap: true
-  - version: v3.29.101
+  - version: v3.29.200
     filename: /charts/rke2-calico.yaml
     bootstrap: true
   - version: v3.29.101

diff --git a/scripts/build-images b/scripts/build-images
@@ -33,7 +33,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-traefik.txt
 EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt
-    ${REGISTRY}/rancher/hardened-calico:v3.29.1-build20250206
+    ${REGISTRY}/rancher/hardened-calico:v3.29.2-build20250206
     ${REGISTRY}/rancher/hardened-flannel:v0.26.4-build20250206
 EOF
 
@@ -53,16 +53,16 @@ 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.36.2
-    ${REGISTRY}/rancher/mirrored-calico-ctl:v3.29.1
-    ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.29.1
-    ${REGISTRY}/rancher/mirrored-calico-typha:v3.29.1
-    ${REGISTRY}/rancher/mirrored-calico-node:v3.29.1
-    ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.29.1
-    ${REGISTRY}/rancher/mirrored-calico-cni:v3.29.1
-    ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.29.1
-    ${REGISTRY}/rancher/mirrored-calico-csi:v3.29.1
-    ${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.29.1
+    ${REGISTRY}/rancher/mirrored-calico-operator:v1.36.5
+    ${REGISTRY}/rancher/mirrored-calico-ctl:v3.29.2
+    ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.29.2
+    ${REGISTRY}/rancher/mirrored-calico-typha:v3.29.2
+    ${REGISTRY}/rancher/mirrored-calico-node:v3.29.2
+    ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.29.2
+    ${REGISTRY}/rancher/mirrored-calico-cni:v3.29.2
+    ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.29.2
+    ${REGISTRY}/rancher/mirrored-calico-csi:v3.29.2
+    ${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.29.2
 EOF
 
 if [ "${GOARCH}" != "arm64" ]; then