Skip to content

Commit 0867c99

Browse files
estespestesp
authored
Merge pull request #5355 from thaJeztah/bump_cni
go.mod: github.com/containerd/go-cni v1.0.2
2 parents 10ecf83 + 864a332 commit 0867c99

21 files changed

Lines changed: 132 additions & 86 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/containerd/console v1.0.2
1212
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e
1313
github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d
14-
github.com/containerd/go-cni v1.0.1
14+
github.com/containerd/go-cni v1.0.2
1515
github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
1616
github.com/containerd/imgcrypt v1.1.1
1717
github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14

‎go.sum‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZ
137137
github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
138138
github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d h1:u6sWqdNGAy7+O8qG/r1dqdnZE7IdEjteK3WGuvbfreo=
139139
github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
140-
github.com/containerd/go-cni v1.0.1 h1:VXr2EkOPD0v1gu7CKfof6XzEIDzsE/dI9yj/W7PSWLs=
141140
github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU=
141+
github.com/containerd/go-cni v1.0.2 h1:YbJAhpTevL2v6u8JC1NhCYRwf+3Vzxcc5vGnYoJ7VeE=
142+
github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk=
142143
github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
143144
github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
144145
github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g=

‎integration/client/go.sum‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e h1:6JKvHHt39
8282
github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
8383
github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d h1:u6sWqdNGAy7+O8qG/r1dqdnZE7IdEjteK3WGuvbfreo=
8484
github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
85-
github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU=
85+
github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk=
8686
github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g=
8787
github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0 h1:e+50zk22gvHLJKe8+d+xSMyA88PPQk/XfWuUw1BdnPA=
8888
github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok=
@@ -352,11 +352,9 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
352352
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
353353
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
354354
github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
355-
github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
356355
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
357356
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
358357
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
359-
github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
360358
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
361359
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
362360
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=

‎pkg/cri/server/cni_conf_syncer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ type cniNetConfSyncer struct {
3636
watcher *fsnotify.Watcher
3737
confDir string
3838
netPlugin cni.CNI
39-
loadOpts []cni.CNIOpt
39+
loadOpts []cni.Opt
4040
}
4141

4242
// newCNINetConfSyncer creates cni network conf syncer.
43-
func newCNINetConfSyncer(confDir string, netPlugin cni.CNI, loadOpts []cni.CNIOpt) (*cniNetConfSyncer, error) {
43+
func newCNINetConfSyncer(confDir string, netPlugin cni.CNI, loadOpts []cni.Opt) (*cniNetConfSyncer, error) {
4444
watcher, err := fsnotify.NewWatcher()
4545
if err != nil {
4646
return nil, errors.Wrap(err, "failed to create fsnotify watcher")

‎pkg/cri/server/sandbox_run.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ func (c *criService) getSandboxRuntime(config *runtime.PodSandboxConfig, runtime
544544
return handler, nil
545545
}
546546

547-
func logDebugCNIResult(ctx context.Context, sandboxID string, result *cni.CNIResult) {
547+
func logDebugCNIResult(ctx context.Context, sandboxID string, result *cni.Result) {
548548
if logrus.GetLevel() < logrus.DebugLevel {
549549
return
550550
}

‎pkg/cri/server/sandbox_status.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ type SandboxInfo struct {
139139
RuntimeOptions interface{} `json:"runtimeOptions"`
140140
Config *runtime.PodSandboxConfig `json:"config"`
141141
RuntimeSpec *runtimespec.Spec `json:"runtimeSpec"`
142-
CNIResult *cni.CNIResult `json:"cniResult"`
142+
CNIResult *cni.Result `json:"cniResult"`
143143
}
144144

145145
// toCRISandboxInfo converts internal container object information to CRI sandbox status response info map.

‎pkg/cri/server/service_linux.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ func (c *criService) initPlatform() error {
7373
}
7474

7575
// cniLoadOptions returns cni load options for the linux.
76-
func (c *criService) cniLoadOptions() []cni.CNIOpt {
77-
return []cni.CNIOpt{cni.WithLoNetwork, cni.WithDefaultConf}
76+
func (c *criService) cniLoadOptions() []cni.Opt {
77+
return []cni.Opt{cni.WithLoNetwork, cni.WithDefaultConf}
7878
}

‎pkg/cri/server/service_other.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ func (c *criService) initPlatform() error {
2828
}
2929

3030
// cniLoadOptions returns cni load options for the linux.
31-
func (c *criService) cniLoadOptions() []cni.CNIOpt {
32-
return []cni.CNIOpt{}
31+
func (c *criService) cniLoadOptions() []cni.Opt {
32+
return []cni.Opt{}
3333
}

‎pkg/cri/server/service_windows.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ func (c *criService) initPlatform() error {
4747
}
4848

4949
// cniLoadOptions returns cni load options for the windows.
50-
func (c *criService) cniLoadOptions() []cni.CNIOpt {
51-
return []cni.CNIOpt{cni.WithDefaultConf}
50+
func (c *criService) cniLoadOptions() []cni.Opt {
51+
return []cni.Opt{cni.WithDefaultConf}
5252
}

‎pkg/cri/server/testing/fake_cni_plugin.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func NewFakeCNIPlugin() *FakeCNIPlugin {
3434
}
3535

3636
// Setup setups the network of PodSandbox.
37-
func (f *FakeCNIPlugin) Setup(ctx context.Context, id, path string, opts ...cni.NamespaceOpts) (*cni.CNIResult, error) {
37+
func (f *FakeCNIPlugin) Setup(ctx context.Context, id, path string, opts ...cni.NamespaceOpts) (*cni.Result, error) {
3838
return nil, nil
3939
}
4040

@@ -49,7 +49,7 @@ func (f *FakeCNIPlugin) Status() error {
4949
}
5050

5151
// Load loads the network config.
52-
func (f *FakeCNIPlugin) Load(opts ...cni.CNIOpt) error {
52+
func (f *FakeCNIPlugin) Load(opts ...cni.Opt) error {
5353
return f.LoadErr
5454
}
5555

0 commit comments

Comments
 (0)