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 <[email protected]>
brandond · May 4, 2023 · cedefef · cedefef
1 parent a736b4b
commit cedefef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/pkg/agent/flannel/setup.go b/pkg/agent/flannel/setup.go
@@ -40,6 +40,12 @@ const (
       "capabilities":{
         "portMappings":true
       }
+    },
+    {
+      "type":"bandwidth",
+      "capabilities":{
+        "bandwidth":true
+      }
     }
   ]
 }

diff --git 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
@@ -53,7 +53,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