From 62952ffdace2bffe87db41bd2d013dd13fa058ad Mon Sep 17 00:00:00 2001 From: Casey Callendrello Date: Tue, 7 Sep 2021 15:43:35 +0200 Subject: [PATCH] vendor: bump to libcni v1.0.1 Signed-off-by: Casey Callendrello --- go.mod | 2 +- go.sum | 2 ++ .../cni/pkg/version/version.go | 18 +++++++++++++++++- vendor/modules.txt | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7a8a74a2..8c9e62b6 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Microsoft/hcsshim v0.8.20 github.com/alexflint/go-filemutex v1.1.0 github.com/buger/jsonparser v1.1.1 - github.com/containernetworking/cni v1.0.0 + github.com/containernetworking/cni v1.0.1 github.com/coreos/go-iptables v0.6.0 github.com/coreos/go-systemd/v22 v22.3.2 github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c diff --git a/go.sum b/go.sum index f8b5cbf2..d823e022 100644 --- a/go.sum +++ b/go.sum @@ -180,6 +180,8 @@ github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v1.0.0 h1:9VJe1a5uKtdeJIHC/UvbTweracOh6GafT0nfbEGVcQ0= github.com/containernetworking/cni v1.0.0/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y= +github.com/containernetworking/cni v1.0.1 h1:9OIL/sZmMYDBe+G8svzILAlulUpaDTUjeAbtH/JNLBo= +github.com/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y= github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= diff --git a/vendor/github.com/containernetworking/cni/pkg/version/version.go b/vendor/github.com/containernetworking/cni/pkg/version/version.go index 709a1fb3..1326f803 100644 --- a/vendor/github.com/containernetworking/cni/pkg/version/version.go +++ b/vendor/github.com/containernetworking/cni/pkg/version/version.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/containernetworking/cni/pkg/types" - "github.com/containernetworking/cni/pkg/types/100" + types100 "github.com/containernetworking/cni/pkg/types/100" "github.com/containernetworking/cni/pkg/types/create" ) @@ -38,6 +38,22 @@ func Current() string { var Legacy = PluginSupports("0.1.0", "0.2.0") var All = PluginSupports("0.1.0", "0.2.0", "0.3.0", "0.3.1", "0.4.0", "1.0.0") +// VersionsFrom returns a list of versions starting from min, inclusive +func VersionsStartingFrom(min string) PluginInfo { + out := []string{} + // cheat, just assume ordered + ok := false + for _, v := range All.SupportedVersions() { + if !ok && v == min { + ok = true + } + if ok { + out = append(out, v) + } + } + return PluginSupports(out...) +} + // Finds a Result object matching the requested version (if any) and asks // that object to parse the plugin result, returning an error if parsing failed. func NewResult(version string, resultBytes []byte) (types.Result, error) { diff --git a/vendor/modules.txt b/vendor/modules.txt index 9d66c80c..e99911d0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -37,7 +37,7 @@ github.com/alexflint/go-filemutex github.com/buger/jsonparser # github.com/containerd/cgroups v1.0.1 github.com/containerd/cgroups/stats/v1 -# github.com/containernetworking/cni v1.0.0 +# github.com/containernetworking/cni v1.0.1 ## explicit github.com/containernetworking/cni/libcni github.com/containernetworking/cni/pkg/invoke