From 843e422766a1ba82df9e349fc0258e97583e33fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Serv=C3=A9n=20Mar=C3=ADn?= Date: Thu, 14 Apr 2022 11:43:32 +0200 Subject: [PATCH] CNI: bump to 1.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit bumps the declared version of CNI in the Kilo manifests to 1.0.1. This is possible with no changes to the configuration lists because our simple configuration is not affected by any of the deprecations, and there was effectively no change between 0.4.0 and 1.0.0, other than the declaration of a stable API. Similarly, this commit also bumps the version of the CNI library and the plugins package. Bumping to CNI 1.0.0 will help ensure that Kilo stays compatible with container runtimes in the future. Signed-off-by: Lucas Servén Marín --- go.mod | 17 ++++++++++------- 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 +- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index fffa527..b1d1500 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,15 @@ go 1.17 require ( github.com/awalterschulze/gographviz v0.0.0-20181013152038-b2885df04310 github.com/campoy/embedmd v1.0.0 - github.com/containernetworking/cni v0.8.1 - github.com/containernetworking/plugins v0.6.0 - github.com/coreos/go-iptables v0.4.0 + github.com/containernetworking/cni v1.0.1 + github.com/containernetworking/plugins v1.1.1 + github.com/coreos/go-iptables v0.6.0 github.com/go-kit/kit v0.9.0 - github.com/imdario/mergo v0.3.6 // indirect github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 github.com/oklog/run v1.1.0 github.com/prometheus/client_golang v1.11.0 github.com/spf13/cobra v1.1.3 - github.com/vishvananda/netlink v1.0.0 - github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect + github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 golang.org/x/lint v0.0.0-20200302205851-738671d3881b golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211124212657-dd7407c86d22 @@ -40,8 +38,10 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.6 // indirect github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.2.0 // indirect github.com/googleapis/gnostic v0.4.1 // indirect github.com/hashicorp/golang-lru v0.5.1 // indirect + github.com/imdario/mergo v0.3.11 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect github.com/json-iterator/go v1.1.11 // indirect @@ -58,7 +58,10 @@ require ( github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.26.0 // indirect github.com/prometheus/procfs v0.6.0 // indirect + github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/testify v1.7.0 // indirect + github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect golang.org/x/mod v0.4.2 // indirect golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 // indirect @@ -66,7 +69,7 @@ require ( golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect golang.org/x/text v0.3.6 // indirect golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect - golang.org/x/tools v0.1.2 // indirect + golang.org/x/tools v0.1.4 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect golang.zx2c4.com/wireguard v0.0.0-20211123210315-387f7c461a16 // indirect google.golang.org/appengine v1.6.5 // indirect diff --git a/manifests/kilo-bootkube.yaml b/manifests/kilo-bootkube.yaml index 11e2c1e..f2271e8 100644 --- a/manifests/kilo-bootkube.yaml +++ b/manifests/kilo-bootkube.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"0.3.1", + "cniVersion":"1.0.1", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-k3s-userspace-heterogeneous.yaml b/manifests/kilo-k3s-userspace-heterogeneous.yaml index d70f08d..56a4af0 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":"0.3.1", + "cniVersion":"1.0.1", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-k3s-userspace.yaml b/manifests/kilo-k3s-userspace.yaml index 3509f70..b2bf50f 100644 --- a/manifests/kilo-k3s-userspace.yaml +++ b/manifests/kilo-k3s-userspace.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"0.3.1", + "cniVersion":"1.0.1", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-k3s.yaml b/manifests/kilo-k3s.yaml index 35a9b7d..df04c80 100644 --- a/manifests/kilo-k3s.yaml +++ b/manifests/kilo-k3s.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"0.3.1", + "cniVersion":"1.0.1", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-kubeadm-userspace.yaml b/manifests/kilo-kubeadm-userspace.yaml index 2477940..e468453 100644 --- a/manifests/kilo-kubeadm-userspace.yaml +++ b/manifests/kilo-kubeadm-userspace.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"0.3.1", + "cniVersion":"1.0.1", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-kubeadm.yaml b/manifests/kilo-kubeadm.yaml index 754fe5e..35368f4 100644 --- a/manifests/kilo-kubeadm.yaml +++ b/manifests/kilo-kubeadm.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"0.3.1", + "cniVersion":"1.0.1", "name":"kilo", "plugins":[ { diff --git a/manifests/kilo-typhoon.yaml b/manifests/kilo-typhoon.yaml index 43607ac..4928c10 100644 --- a/manifests/kilo-typhoon.yaml +++ b/manifests/kilo-typhoon.yaml @@ -8,7 +8,7 @@ metadata: data: cni-conf.json: | { - "cniVersion":"0.3.1", + "cniVersion":"1.0.1", "name":"kilo", "plugins":[ {