From 3e6818d0b324ce9911886944d92d21dc067c18ea Mon Sep 17 00:00:00 2001 From: Dave Allan Date: Tue, 19 Apr 2022 08:27:35 -0400 Subject: [PATCH 1/2] bump CNI plugins version to 1.1.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fbc2dc8..dd3b7fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FROM=alpine FROM $FROM AS cni ARG GOARCH=amd64 -ARG CNI_PLUGINS_VERSION=v0.9.1 +ARG CNI_PLUGINS_VERSION=v1.1.1 RUN apk add --no-cache curl && \ curl -Lo cni.tar.gz https://github.com/containernetworking/plugins/releases/download/$CNI_PLUGINS_VERSION/cni-plugins-linux-$GOARCH-$CNI_PLUGINS_VERSION.tgz && \ tar -xf cni.tar.gz From 19c13b74016537b4ebc630874495039a6903834a Mon Sep 17 00:00:00 2001 From: Dave Allan Date: Tue, 19 Apr 2022 08:28:31 -0400 Subject: [PATCH 2/2] reduce cniVersion from 1.0.1 to 1.0.0 to match spec version --- manifests/kilo-bootkube.yaml | 2 +- manifests/kilo-k3s-userspace-heterogeneous.yaml | 2 +- manifests/kilo-k3s-userspace.yaml | 2 +- manifests/kilo-k3s.yaml | 2 +- manifests/kilo-kubeadm-userspace.yaml | 2 +- manifests/kilo-kubeadm.yaml | 2 +- manifests/kilo-typhoon.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/kilo-bootkube.yaml b/manifests/kilo-bootkube.yaml index 3f56ab8..1246787 100644 --- a/manifests/kilo-bootkube.yaml +++ b/manifests/kilo-bootkube.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"1.0.1", + "cniVersion":"1.0.0", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-k3s-userspace-heterogeneous.yaml b/manifests/kilo-k3s-userspace-heterogeneous.yaml index ad98d2c..64c56bf 100644 --- a/manifests/kilo-k3s-userspace-heterogeneous.yaml +++ b/manifests/kilo-k3s-userspace-heterogeneous.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"1.0.1", + "cniVersion":"1.0.0", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-k3s-userspace.yaml b/manifests/kilo-k3s-userspace.yaml index 1ff9005..3d345b8 100644 --- a/manifests/kilo-k3s-userspace.yaml +++ b/manifests/kilo-k3s-userspace.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"1.0.1", + "cniVersion":"1.0.0", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-k3s.yaml b/manifests/kilo-k3s.yaml index c5b0a75..de17114 100644 --- a/manifests/kilo-k3s.yaml +++ b/manifests/kilo-k3s.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"1.0.1", + "cniVersion":"1.0.0", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-kubeadm-userspace.yaml b/manifests/kilo-kubeadm-userspace.yaml index bbcc1ae..c100da3 100644 --- a/manifests/kilo-kubeadm-userspace.yaml +++ b/manifests/kilo-kubeadm-userspace.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"1.0.1", + "cniVersion":"1.0.0", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-kubeadm.yaml b/manifests/kilo-kubeadm.yaml index cd19d75..03f732b 100644 --- a/manifests/kilo-kubeadm.yaml +++ b/manifests/kilo-kubeadm.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"1.0.1", + "cniVersion":"1.0.0", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-typhoon.yaml b/manifests/kilo-typhoon.yaml index b759377..cde17a2 100644 --- a/manifests/kilo-typhoon.yaml +++ b/manifests/kilo-typhoon.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"1.0.1", + "cniVersion":"1.0.0", "name":"kilo", "plugins":[ {