From b83290278b6c9de320288f9357f07cbb220ad328 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Thu, 11 Apr 2024 17:46:21 +0200
Subject: [PATCH] Update flannel to v0.25.0

Signed-off-by: Manuel Buil <mbuil@suse.com>
---
 Dockerfile.windows         | 2 +-
 charts/chart_versions.yaml | 2 +-
 scripts/build-images       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.windows b/Dockerfile.windows
index dc5a6acd54..5ce2712797 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -46,7 +46,7 @@ ARG KUBERNETES_VERSION=dev
 ENV CRICTL_VERSION="v1.29.0"
 ENV CALICO_VERSION="v3.27.2"
 ENV CNI_PLUGIN_VERSION="v1.4.0"
-ENV FLANNEL_VERSION="v0.24.2"
+ENV FLANNEL_VERSION="v0.25.0"
 ENV CNI_FLANNEL_VERSION="v1.4.0-flannel1"
 
 RUN mkdir -p rancher
diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
index b923070ad7..e584bd057f 100644
--- a/charts/chart_versions.yaml
+++ b/charts/chart_versions.yaml
@@ -23,7 +23,7 @@ charts:
   - version: v4.0.2-build2024020802
     filename: /charts/rke2-multus.yaml
     bootstrap: true
-  - version: v0.24.401
+  - version: v0.25.000
     filename: /charts/rke2-flannel.yaml
     bootstrap: true
   - version: 1.7.001
diff --git a/scripts/build-images b/scripts/build-images
index 98f38717ed..efd762c2b9 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -99,7 +99,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.24.4-build20240321
+    ${REGISTRY}/rancher/hardened-flannel:v0.25.0-build20240410
     ${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240325
 EOF
 fi