From 5f9618b94ca1d494934858f8fdeb3c2d699f9535 Mon Sep 17 00:00:00 2001
From: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
Date: Fri, 15 Nov 2024 15:41:07 +0100
Subject: [PATCH] Updated flannel cni image to 1.6.0

Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
---
 Documentation/kube-flannel-psp.yml                              | 2 +-
 Documentation/kube-flannel.yml                                  | 2 +-
 .../kustomization/kube-flannel-psp/kube-flannel-psp.yml         | 2 +-
 Documentation/kustomization/kube-flannel/kube-flannel.yml       | 2 +-
 chart/kube-flannel/values.yaml                                  | 2 +-
 e2e/Dockerfile                                                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/kube-flannel-psp.yml b/Documentation/kube-flannel-psp.yml
index 8203748f6..f5a8e3409 100644
--- a/Documentation/kube-flannel-psp.yml
+++ b/Documentation/kube-flannel-psp.yml
@@ -166,7 +166,7 @@ spec:
       serviceAccountName: flannel
       initContainers:
       - name: install-cni-plugin
-        image: docker.io/flannel/flannel-cni-plugin:v1.5.1-flannel2
+        image: docker.io/flannel/flannel-cni-plugin:v1.6.0-flannel1
         command:
         - cp
         args:
diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml
index d05b24fcb..51d39941e 100644
--- a/Documentation/kube-flannel.yml
+++ b/Documentation/kube-flannel.yml
@@ -133,7 +133,7 @@ spec:
       serviceAccountName: flannel
       initContainers:
       - name: install-cni-plugin
-        image: docker.io/flannel/flannel-cni-plugin:v1.5.1-flannel2
+        image: docker.io/flannel/flannel-cni-plugin:v1.6.0-flannel1
         command:
         - cp
         args:
diff --git a/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml b/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml
index 8203748f6..f5a8e3409 100644
--- a/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml
+++ b/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml
@@ -166,7 +166,7 @@ spec:
       serviceAccountName: flannel
       initContainers:
       - name: install-cni-plugin
-        image: docker.io/flannel/flannel-cni-plugin:v1.5.1-flannel2
+        image: docker.io/flannel/flannel-cni-plugin:v1.6.0-flannel1
         command:
         - cp
         args:
diff --git a/Documentation/kustomization/kube-flannel/kube-flannel.yml b/Documentation/kustomization/kube-flannel/kube-flannel.yml
index 7387ea20b..ed61be20d 100644
--- a/Documentation/kustomization/kube-flannel/kube-flannel.yml
+++ b/Documentation/kustomization/kube-flannel/kube-flannel.yml
@@ -124,7 +124,7 @@ spec:
       serviceAccountName: flannel
       initContainers:
       - name: install-cni-plugin
-        image: docker.io/flannel/flannel-cni-plugin:v1.5.1-flannel2
+        image: docker.io/flannel/flannel-cni-plugin:v1.6.0-flannel1
         command:
         - cp
         args:
diff --git a/chart/kube-flannel/values.yaml b/chart/kube-flannel/values.yaml
index 9eba3bea1..44268eb59 100644
--- a/chart/kube-flannel/values.yaml
+++ b/chart/kube-flannel/values.yaml
@@ -15,7 +15,7 @@ flannel:
     tag: v0.26.1
   image_cni:
     repository: docker.io/flannel/flannel-cni-plugin
-    tag: v1.5.1-flannel2
+    tag: v1.6.0-flannel1
   # flannel command arguments
   enableNFTables: false
   args:
diff --git a/e2e/Dockerfile b/e2e/Dockerfile
index c585413f5..9ccf04d06 100644
--- a/e2e/Dockerfile
+++ b/e2e/Dockerfile
@@ -4,7 +4,7 @@ ARG SLES="registry.suse.com/suse/sle15:15.4"
 FROM ${SLES} AS k3s
 ARG ARCH
 ARG K3S_VERSION="v1.29.8+k3s1"
-ARG CNI_VERSION="v1.5.1" 
+ARG CNI_VERSION="v1.6.0" 
 RUN set -x \
  && zypper -n in \
     ca-certificates \