From ba5a46462c757488b807b22a38c2b376fd76e215 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Mon, 10 Jun 2024 20:53:39 +0200
Subject: [PATCH] Update flannel version to v0.25.4 (#6172)

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 f627ccdb5d..a8625a8af7 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -46,7 +46,7 @@ ARG KUBERNETES_VERSION=dev
 ENV CRICTL_VERSION="v1.27.0"
 ENV CALICO_VERSION="v3.27.3"
 ENV CNI_PLUGIN_VERSION="v1.4.1"
-ENV FLANNEL_VERSION="v0.25.3"
+ENV FLANNEL_VERSION="v0.25.4"
 ENV CNI_FLANNEL_VERSION="v1.4.1-flannel1"
 
 RUN mkdir -p rancher
diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml
index 6073a33ef2..9cd4278428 100644
--- a/charts/chart_versions.yaml
+++ b/charts/chart_versions.yaml
@@ -23,7 +23,7 @@ charts:
   - version: v4.0.205
     filename: /charts/rke2-multus.yaml
     bootstrap: true
-  - version: v0.25.300
+  - version: v0.25.400
     filename: /charts/rke2-flannel.yaml
     bootstrap: true
   - version: 1.7.001
diff --git a/scripts/build-images b/scripts/build-images
index 915d6c8c62..ee9103b78e 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -102,7 +102,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.3-build20240605
+    ${REGISTRY}/rancher/hardened-flannel:v0.25.4-build20240610
     ${REGISTRY}/rancher/hardened-cni-plugins:v1.4.1-build20240430
 EOF
 fi