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 cedefeff24)
pull/7535/head
Brad Davidson 2023-05-04 17:46:40 +00:00 committed by Brad Davidson
parent fc058fdcdb
commit 5227fe8cd5
3 changed files with 8 additions and 2 deletions

View File

@ -41,6 +41,12 @@ const (
"capabilities":{ "capabilities":{
"portMappings":true "portMappings":true
} }
},
{
"type":"bandwidth",
"capabilities":{
"bandwidth":true
}
} }
] ]
} }

View File

@ -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 ln -s k3s bin/$i
done 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 rm -f bin/$i
ln -s cni bin/$i ln -s cni bin/$i
done done

View File

@ -51,7 +51,7 @@ if [ -z "$VERSION_CRI_DOCKERD" ]; then
VERSION_CRI_DOCKERD="v0.0.0" VERSION_CRI_DOCKERD="v0.0.0"
fi 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}') VERSION_KUBE_ROUTER=$(grep github.com/k3s-io/kube-router go.mod | head -n1 | awk '{print $4}')
if [ -z "$VERSION_KUBE_ROUTER" ]; then if [ -z "$VERSION_KUBE_ROUTER" ]; then