From e3725e8bb4e6e7a7e30247460188654087594e60 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Mon, 10 Jun 2024 18:10:43 +0200
Subject: [PATCH] Prepare Flannel update to v0.25.4

Signed-off-by: Manuel Buil <mbuil@suse.com>
---
 Documentation/kube-flannel-psp.yml                            | 4 ++--
 Documentation/kube-flannel.yml                                | 4 ++--
 .../kustomization/kube-flannel-psp/kube-flannel-psp.yml       | 4 ++--
 Documentation/kustomization/kube-flannel/kube-flannel.yml     | 4 ++--
 Documentation/kustomization/kube-flannel/kustomization.yaml   | 2 +-
 chart/kube-flannel/Chart.yaml                                 | 4 ++--
 chart/kube-flannel/values.yaml                                | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Documentation/kube-flannel-psp.yml b/Documentation/kube-flannel-psp.yml
index 1ad7ef4d18..0ff29bdd3c 100644
--- a/Documentation/kube-flannel-psp.yml
+++ b/Documentation/kube-flannel-psp.yml
@@ -177,7 +177,7 @@ spec:
         - name: cni-plugin
           mountPath: /opt/cni/bin
       - name: install-cni
-        image: docker.io/flannel/flannel:v0.25.3
+        image: docker.io/flannel/flannel:v0.25.4
         command:
         - cp
         args:
@@ -191,7 +191,7 @@ spec:
           mountPath: /etc/kube-flannel/
       containers:
       - name: kube-flannel
-        image: docker.io/flannel/flannel:v0.25.3
+        image: docker.io/flannel/flannel:v0.25.4
         command:
         - /opt/bin/flanneld
         args:
diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml
index 94c2b87446..289c4ac085 100644
--- a/Documentation/kube-flannel.yml
+++ b/Documentation/kube-flannel.yml
@@ -144,7 +144,7 @@ spec:
         - name: cni-plugin
           mountPath: /opt/cni/bin
       - name: install-cni
-        image: docker.io/flannel/flannel:v0.25.3
+        image: docker.io/flannel/flannel:v0.25.4
         command:
         - cp
         args:
@@ -158,7 +158,7 @@ spec:
           mountPath: /etc/kube-flannel/
       containers:
       - name: kube-flannel
-        image: docker.io/flannel/flannel:v0.25.3
+        image: docker.io/flannel/flannel:v0.25.4
         command:
         - /opt/bin/flanneld
         args:
diff --git a/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml b/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml
index 1ad7ef4d18..0ff29bdd3c 100644
--- a/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml
+++ b/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml
@@ -177,7 +177,7 @@ spec:
         - name: cni-plugin
           mountPath: /opt/cni/bin
       - name: install-cni
-        image: docker.io/flannel/flannel:v0.25.3
+        image: docker.io/flannel/flannel:v0.25.4
         command:
         - cp
         args:
@@ -191,7 +191,7 @@ spec:
           mountPath: /etc/kube-flannel/
       containers:
       - name: kube-flannel
-        image: docker.io/flannel/flannel:v0.25.3
+        image: docker.io/flannel/flannel:v0.25.4
         command:
         - /opt/bin/flanneld
         args:
diff --git a/Documentation/kustomization/kube-flannel/kube-flannel.yml b/Documentation/kustomization/kube-flannel/kube-flannel.yml
index c7f2ecae05..72ea885f03 100644
--- a/Documentation/kustomization/kube-flannel/kube-flannel.yml
+++ b/Documentation/kustomization/kube-flannel/kube-flannel.yml
@@ -141,7 +141,7 @@ spec:
         - name: cni-plugin
           mountPath: /opt/cni/bin
       - name: install-cni
-        image: docker.io/flannel/flannel:v0.25.3
+        image: docker.io/flannel/flannel:v0.25.4
         command:
         - cp
         args:
@@ -155,7 +155,7 @@ spec:
           mountPath: /etc/kube-flannel/
       containers:
       - name: kube-flannel
-        image: docker.io/flannel/flannel:v0.25.3
+        image: docker.io/flannel/flannel:v0.25.4
         command:
         - /opt/bin/flanneld
         args:
diff --git a/Documentation/kustomization/kube-flannel/kustomization.yaml b/Documentation/kustomization/kube-flannel/kustomization.yaml
index 38a74c1a4d..7718f03935 100644
--- a/Documentation/kustomization/kube-flannel/kustomization.yaml
+++ b/Documentation/kustomization/kube-flannel/kustomization.yaml
@@ -6,4 +6,4 @@ resources:
 - kube-flannel.yml
 images:
 - name: docker.io/flannel/flannel
-  newTag: v0.25.3
+  newTag: v0.25.4
diff --git a/chart/kube-flannel/Chart.yaml b/chart/kube-flannel/Chart.yaml
index 45f1dafe28..666b38fe9b 100644
--- a/chart/kube-flannel/Chart.yaml
+++ b/chart/kube-flannel/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
-appVersion: v0.25.3
+appVersion: v0.25.4
 description: Install Flannel Network Plugin.
 keywords:
 - Flannel
 name: flannel
 sources:
 - https://github.com/flannel-io/flannel
-version: v0.25.3
+version: v0.25.4
diff --git a/chart/kube-flannel/values.yaml b/chart/kube-flannel/values.yaml
index eea96a9b80..cafbb5d76e 100644
--- a/chart/kube-flannel/values.yaml
+++ b/chart/kube-flannel/values.yaml
@@ -12,7 +12,7 @@ flannel:
   # kube-flannel image
   image:
     repository: docker.io/flannel/flannel
-    tag: v0.25.3
+    tag: v0.25.4
   image_cni:
     repository: docker.io/flannel/flannel-cni-plugin
     tag: v1.4.1-flannel1