From 5227fe8cd5b9c02ba4eabc6fd89a9237e483531a Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Thu, 4 May 2023 17:46:40 +0000
Subject: [PATCH] Bump cni plugins to v1.2.0-k3s1

Also add bandwidth and firewall plugins. The bandwidth plugin is
automatically registered with the appropriate capability, but the
firewall plugin must be configured by the user if they want to use it.

Ref: https://www.cni.dev/plugins/current/meta/firewall/

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit cedefeff2480115e1b548ea00780fe43e9c0a718)
---
 pkg/agent/flannel/setup.go | 6 ++++++
 scripts/package-cli        | 2 +-
 scripts/version.sh         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkg/agent/flannel/setup.go b/pkg/agent/flannel/setup.go
index 529d22b4e2..7c61b9e787 100644
--- a/pkg/agent/flannel/setup.go
+++ b/pkg/agent/flannel/setup.go
@@ -41,6 +41,12 @@ const (
       "capabilities":{
         "portMappings":true
       }
+    },
+    {
+      "type":"bandwidth",
+      "capabilities":{
+        "bandwidth":true
+      }
     }
   ]
 }
diff --git a/scripts/package-cli b/scripts/package-cli
index 2c71e851d1..43a28407a8 100755
--- a/scripts/package-cli
+++ b/scripts/package-cli
@@ -12,7 +12,7 @@ for i in crictl kubectl k3s-agent k3s-server k3s-token k3s-etcd-snapshot k3s-sec
     ln -s k3s bin/$i
 done
 
-for i in bridge flannel host-local loopback portmap; do
+for i in bandwidth bridge firewall flannel host-local loopback portmap; do
     rm -f bin/$i
     ln -s cni bin/$i
 done
diff --git a/scripts/version.sh b/scripts/version.sh
index c2e7d044e4..e55e7f3a5c 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -51,7 +51,7 @@ if [ -z "$VERSION_CRI_DOCKERD" ]; then
   VERSION_CRI_DOCKERD="v0.0.0"
 fi
 
-VERSION_CNIPLUGINS="v1.1.1-k3s1"
+VERSION_CNIPLUGINS="v1.2.0-k3s1"
 
 VERSION_KUBE_ROUTER=$(grep github.com/k3s-io/kube-router go.mod | head -n1 | awk '{print $4}')
 if [ -z "$VERSION_KUBE_ROUTER" ]; then