Merge pull request #7501 from thomasferrandiz/issue-7496_release-1.31

[release 1.31] Bump flannel, canal and multus charts
rancher · Jan 9, 2025 · 496ed82 · 496ed82
2 parents 4102d77 + 82606dd
commit 496ed82
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -46,7 +46,7 @@ ARG KUBERNETES_VERSION=dev
 ENV CRICTL_VERSION="v1.30.1"
 ENV CALICO_VERSION="v3.29.1"
 ENV CNI_PLUGIN_VERSION="v1.4.1"
-ENV FLANNEL_VERSION="v0.26.1"
+ENV FLANNEL_VERSION="v0.26.3"
 ENV CNI_FLANNEL_VERSION="v1.6.0-flannel1"
 
 RUN mkdir -p rancher

diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
@@ -2,7 +2,7 @@ charts:
   - version: 1.16.400
     filename: /charts/rke2-cilium.yaml
     bootstrap: true
-  - version: v3.29.1-build2024121100
+  - version: v3.29.1-build2024121101
     filename: /charts/rke2-canal.yaml
     bootstrap: true
   - version: v3.29.100
@@ -26,10 +26,10 @@ charts:
   - version: 3.12.004
     filename: /charts/rke2-metrics-server.yaml
     bootstrap: false
-  - version: v4.1.301
+  - version: v4.1.400
     filename: /charts/rke2-multus.yaml
     bootstrap: true
-  - version: v0.26.101
+  - version: v0.26.300
     filename: /charts/rke2-flannel.yaml
     bootstrap: true
   - version: 1.9.100

diff --git a/scripts/build-images b/scripts/build-images
@@ -35,7 +35,7 @@ EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt
     ${REGISTRY}/rancher/hardened-calico:v3.29.1-build20241211
-    ${REGISTRY}/rancher/hardened-flannel:v0.26.1-build20241211
+    ${REGISTRY}/rancher/hardened-flannel:v0.26.3-build20250108
 EOF
 
 if [ "${GOARCH}" != "s390x" ]; then
@@ -81,7 +81,7 @@ EOF
 fi
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt
-    ${REGISTRY}/rancher/hardened-multus-cni:v4.1.3-build20241028
+    ${REGISTRY}/rancher/hardened-multus-cni:v4.1.4-build20250108
     ${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022
     ${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20241011
     ${REGISTRY}/rancher/mirrored-library-busybox:1.36.1
@@ -98,7 +98,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-harvester.txt
 EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-flannel.txt
-    ${REGISTRY}/rancher/hardened-flannel:v0.26.1-build20241211
+    ${REGISTRY}/rancher/hardened-flannel:v0.26.3-build20250108
     ${REGISTRY}/rancher/hardened-cni-plugins:v1.6.0-build20241022
 EOF
 fi