diff --git a/go.mod b/go.mod index 14426827..6cfb1449 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/containerd/containerd v1.6.0-rc.2 github.com/containerd/continuity v0.2.2 github.com/containerd/fuse-overlayfs-snapshotter v1.0.2 - github.com/containerd/go-cni v1.1.2 + github.com/containerd/go-cni v1.1.3 github.com/containerd/go-runc v1.0.0 github.com/containerd/stargz-snapshotter v0.11.0 github.com/containerd/stargz-snapshotter/estargz v0.11.0 diff --git a/go.sum b/go.sum index e3813629..9a7b1968 100644 --- a/go.sum +++ b/go.sum @@ -331,8 +331,8 @@ github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZH github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= github.com/containerd/go-cni v1.1.0/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= github.com/containerd/go-cni v1.1.1/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-cni v1.1.2 h1:futGN9fI70oOPA1DKSN4oFmeZ8tNldb382g5TlwYfFc= -github.com/containerd/go-cni v1.1.2/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= +github.com/containerd/go-cni v1.1.3 h1:t0MQwrtM96SH71Md8tH0uKrVE9v+jxkDTbvFSm3B9VE= +github.com/containerd/go-cni v1.1.3/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= diff --git a/vendor/github.com/containerd/go-cni/opts.go b/vendor/github.com/containerd/go-cni/opts.go index 76c68153..309d014e 100644 --- a/vendor/github.com/containerd/go-cni/opts.go +++ b/vendor/github.com/containerd/go-cni/opts.go @@ -18,10 +18,13 @@ package cni import ( "fmt" + "os" "sort" "strings" cnilibrary "github.com/containernetworking/cni/libcni" + "github.com/containernetworking/cni/pkg/invoke" + "github.com/containernetworking/cni/pkg/version" ) // Opt sets options for a CNI instance @@ -41,7 +44,13 @@ func WithInterfacePrefix(prefix string) Opt { func WithPluginDir(dirs []string) Opt { return func(c *libcni) error { c.pluginDirs = dirs - c.cniConfig = &cnilibrary.CNIConfig{Path: dirs} + c.cniConfig = cnilibrary.NewCNIConfig( + dirs, + &invoke.DefaultExec{ + RawExec: &invoke.RawExec{Stderr: os.Stderr}, + PluginDecoder: version.PluginDecoder{}, + }, + ) return nil } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 7cc46396..f3130e2c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -146,7 +146,7 @@ github.com/containerd/fifo # github.com/containerd/fuse-overlayfs-snapshotter v1.0.2 ## explicit; go 1.16 github.com/containerd/fuse-overlayfs-snapshotter -# github.com/containerd/go-cni v1.1.2 +# github.com/containerd/go-cni v1.1.3 ## explicit; go 1.13 github.com/containerd/go-cni # github.com/containerd/go-runc v1.0.0