Merge pull request #7231 from thomasferrandiz/issue-7225_release-1.30

[release 1.30] Bump rke2-calico to v3.29.0
rancher · Nov 7, 2024 · f0dac02 · f0dac02
2 parents 75e6b10 + 8e1652b
commit f0dac02
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 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.28.2"
+ENV CALICO_VERSION="v3.29.0"
 ENV CNI_PLUGIN_VERSION="v1.4.1"
 ENV FLANNEL_VERSION="v0.26.0"
 ENV CNI_FLANNEL_VERSION="v1.6.0-flannel1"

diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
@@ -5,10 +5,10 @@ charts:
   - version: v3.29.0-build2024110400
     filename: /charts/rke2-canal.yaml
     bootstrap: true
-  - version: v3.28.200
+  - version: v3.29.000
     filename: /charts/rke2-calico.yaml
     bootstrap: true
-  - version: v3.28.200
+  - version: v3.29.000
     filename: /charts/rke2-calico-crd.yaml
     bootstrap: true
   - version: 1.33.002

diff --git a/scripts/build-images b/scripts/build-images
@@ -54,16 +54,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.34.5
-    ${REGISTRY}/rancher/mirrored-calico-ctl:v3.28.2
-    ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.28.2
-    ${REGISTRY}/rancher/mirrored-calico-typha:v3.28.2
-    ${REGISTRY}/rancher/mirrored-calico-node:v3.28.2
-    ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.28.2
-    ${REGISTRY}/rancher/mirrored-calico-cni:v3.28.2
-    ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.28.2
-    ${REGISTRY}/rancher/mirrored-calico-csi:v3.28.2
-    ${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.28.2
+    ${REGISTRY}/rancher/mirrored-calico-operator:v1.36.0
+    ${REGISTRY}/rancher/mirrored-calico-ctl:v3.29.0
+    ${REGISTRY}/rancher/mirrored-calico-kube-controllers:v3.29.0
+    ${REGISTRY}/rancher/mirrored-calico-typha:v3.29.0
+    ${REGISTRY}/rancher/mirrored-calico-node:v3.29.0
+    ${REGISTRY}/rancher/mirrored-calico-pod2daemon-flexvol:v3.29.0
+    ${REGISTRY}/rancher/mirrored-calico-cni:v3.29.0
+    ${REGISTRY}/rancher/mirrored-calico-apiserver:v3.29.0
+    ${REGISTRY}/rancher/mirrored-calico-csi:v3.29.0
+    ${REGISTRY}/rancher/mirrored-calico-node-driver-registrar:v3.29.0
 EOF
 
 if [ "${GOARCH}" != "arm64" ]; then