Merge pull request #6043 from thomasferrandiz/bump-flannel-canal

Bump flannel to v0.25.201 and canal to v3.28.0-build2024052800

Dockerfile.windows

@@ -46,7 +46,7 @@ ARG KUBERNETES_VERSION=dev
 ENV CRICTL_VERSION="v1.29.0"
 ENV CALICO_VERSION="v3.27.3"
 ENV CNI_PLUGIN_VERSION="v1.4.0"
-ENV FLANNEL_VERSION="v0.25.1"
+ENV FLANNEL_VERSION="v0.25.2"
 ENV CNI_FLANNEL_VERSION="v1.4.0-flannel1"
 
 RUN mkdir -p rancher

charts/chart_versions.yaml

@@ -2,7 +2,7 @@ charts:
   - version: 1.15.500
     filename: /charts/rke2-cilium.yaml
     bootstrap: true
-  - version: v3.27.3-build2024042301
+  - version: v3.28.0-build2024052800
     filename: /charts/rke2-canal.yaml
     bootstrap: true
   - version: v3.27.300
@@ -23,7 +23,7 @@ charts:
   - version: v4.0.205
     filename: /charts/rke2-multus.yaml
     bootstrap: true
-  - version: v0.25.103
+  - version: v0.25.201
     filename: /charts/rke2-flannel.yaml
     bootstrap: true
   - version: 1.7.001

scripts/build-images

@@ -30,8 +30,8 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
 EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt
-    ${REGISTRY}/rancher/hardened-calico:v3.27.3-build20240423
-    ${REGISTRY}/rancher/hardened-flannel:v0.25.1-build20240423
+    ${REGISTRY}/rancher/hardened-calico:v3.28.0-build20240528
+    ${REGISTRY}/rancher/hardened-flannel:v0.25.2-build20240524
 EOF
 
 if [ "${GOARCH}" != "s390x" ]; then
@@ -101,7 +101,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.25.1-build20240423
+    ${REGISTRY}/rancher/hardened-flannel:v0.25.2-build20240524
     ${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240325
 EOF
 fi