Merge pull request #6543 from dmcgowan/update-cni-v1.1.2

Update go-cni to v1.1.3

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/containerd/console v1.0.3
 	github.com/containerd/continuity v0.2.2
 	github.com/containerd/fifo v1.0.0
-	github.com/containerd/go-cni v1.1.1
+	github.com/containerd/go-cni v1.1.3
 	github.com/containerd/go-runc v1.0.0
 	github.com/containerd/imgcrypt v1.1.3
 	github.com/containerd/nri v0.1.0

go.sum

@@ -142,8 +142,8 @@ github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rx
 github.com/containerd/fifo v1.0.0 h1:6PirWBr9/L7GDamKr+XM0IeUFXu5mf3M/BPpH9gaLBU=
 github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
 github.com/containerd/go-cni v1.1.0/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA=
-github.com/containerd/go-cni v1.1.1 h1:UV64yhzDgs27mBIVUrlzG8Z2bc1K0/zokOW5vDNkI4c=
-github.com/containerd/go-cni v1.1.1/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 v1.0.0 h1:oU+lLv1ULm5taqgV/CJivypVODI4SUz1znWjv3nNYS0=
 github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok=
 github.com/containerd/imgcrypt v1.1.3 h1:69UKRsA3Q/lAwo2eDzWshdjimqhmprrWXfNtBeO0fBc=

integration/client/go.sum

@@ -140,7 +140,7 @@ github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rx
 github.com/containerd/fifo v1.0.0 h1:6PirWBr9/L7GDamKr+XM0IeUFXu5mf3M/BPpH9gaLBU=
 github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
 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.3/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA=
 github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g=
 github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok=
 github.com/containerd/go-runc v1.0.0 h1:oU+lLv1ULm5taqgV/CJivypVODI4SUz1znWjv3nNYS0=

pkg/cri/server/testing/fake_cni_plugin.go

@@ -43,6 +43,11 @@ func (f *FakeCNIPlugin) Remove(ctx context.Context, id, path string, opts ...cni
 	return nil
 }
 
+// Check the network of PodSandbox.
+func (f *FakeCNIPlugin) Check(ctx context.Context, id, path string, opts ...cni.NamespaceOpts) error {
+	return nil
+}
+
 // Status get the status of the plugin.
 func (f *FakeCNIPlugin) Status() error {
 	return f.StatusErr

vendor/github.com/containerd/go-cni/README.md

@@ -11,6 +11,7 @@ A generic CNI library to provide APIs for CNI plugin interactions. The library p
 - Setup networks for container namespace
 - Remove networks from container namespace
 - Query status of CNI network plugin initialization
+- Check verifies the network is still in desired state
 
 go-cni aims to support plugins that implement [Container Network Interface](https://github.com/containernetworking/cni)
 

vendor/github.com/containerd/go-cni/cni.go

@@ -19,12 +19,15 @@ package cni
 import (
 	"context"
 	"fmt"
+	"os"
 	"strings"
 	"sync"
 
 	cnilibrary "github.com/containernetworking/cni/libcni"
+	"github.com/containernetworking/cni/pkg/invoke"
 	"github.com/containernetworking/cni/pkg/types"
 	types100 "github.com/containernetworking/cni/pkg/types/100"
+	"github.com/containernetworking/cni/pkg/version"
 )
 
 type CNI interface {
@@ -32,6 +35,8 @@ type CNI interface {
 	Setup(ctx context.Context, id string, path string, opts ...NamespaceOpts) (*Result, error)
 	// Remove tears down the network of the namespace.
 	Remove(ctx context.Context, id string, path string, opts ...NamespaceOpts) error
+	// Check checks if the network is still in desired state
+	Check(ctx context.Context, id string, path string, opts ...NamespaceOpts) error
 	// Load loads the cni network config
 	Load(opts ...Opt) error
 	// Status checks the status of the cni initialization
@@ -84,9 +89,15 @@ func defaultCNIConfig() *libcni {
 			pluginMaxConfNum: DefaultMaxConfNum,
 			prefix:           DefaultPrefix,
 		},
-		cniConfig: &cnilibrary.CNIConfig{
-			Path: []string{DefaultCNIDir},
-		},
+		cniConfig: cnilibrary.NewCNIConfig(
+			[]string{
+				DefaultCNIDir,
+			},
+			&invoke.DefaultExec{
+				RawExec:       &invoke.RawExec{Stderr: os.Stderr},
+				PluginDecoder: version.PluginDecoder{},
+			},
+		),
 		networkCount: 1,
 	}
 }
@@ -217,6 +228,25 @@ func (c *libcni) Remove(ctx context.Context, id string, path string, opts ...Nam
 	return nil
 }
 
+// Check checks if the network is still in desired state
+func (c *libcni) Check(ctx context.Context, id string, path string, opts ...NamespaceOpts) error {
+	if err := c.Status(); err != nil {
+		return err
+	}
+	ns, err := newNamespace(id, path, opts...)
+	if err != nil {
+		return err
+	}
+	for _, network := range c.Networks() {
+		err := network.Check(ctx, ns)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // GetConfig returns a copy of the CNI plugin configurations as parsed by CNI
 func (c *libcni) GetConfig() *ConfigResult {
 	c.RLock()

vendor/github.com/containerd/go-cni/namespace.go

@@ -41,6 +41,10 @@ func (n *Network) Remove(ctx context.Context, ns *Namespace) error {
 	return n.cni.DelNetworkList(ctx, n.config, ns.config(n.ifName))
 }
 
+func (n *Network) Check(ctx context.Context, ns *Namespace) error {
+	return n.cni.CheckNetworkList(ctx, n.config, ns.config(n.ifName))
+}
+
 type Namespace struct {
 	id             string
 	path           string

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
 	}
 }

vendor/modules.txt

@@ -93,7 +93,7 @@ github.com/containerd/continuity/testutil/loopback
 # github.com/containerd/fifo v1.0.0
 ## explicit
 github.com/containerd/fifo
-# github.com/containerd/go-cni v1.1.1
+# github.com/containerd/go-cni v1.1.3
 ## explicit
 github.com/containerd/go-cni
 # github.com/containerd/go-runc v1.0.0