github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update cri-o/ocicni

Browse Source 
fixes #180

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
This commit is contained in:
Yanqiang Miao 2017-09-03 21:42:49 +08:00
parent 5057c2d4fb
commit 180e2e67af
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -7,7 +7,7 @@ github.com/containerd/cgroups 7a5fdd8330119dc70d850260db8f3594d89d6943
github.com/coreos/go-systemd d2196463941895ee908e13531a23a39feb9e1243 github.com/coreos/go-systemd d2196463941895ee908e13531a23a39feb9e1243
github.com/containernetworking/cni v0.6.0 github.com/containernetworking/cni v0.6.0
github.com/containernetworking/plugins v0.6.0 github.com/containernetworking/plugins v0.6.0
github.com/cri-o/ocicni 0f90d35d89e9ab7e972a9edeb36b0aaffa250335 github.com/cri-o/ocicni 4c2bf6d5198c307f76312f8fc7ef654cfd41d303
github.com/davecgh/go-spew v1.1.0 github.com/davecgh/go-spew v1.1.0
github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621 github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621
github.com/docker/docker cc4da8112814cdbb00dbf23370f9ed764383de1f github.com/docker/docker cc4da8112814cdbb00dbf23370f9ed764383de1f

5
vendor/github.com/cri-o/ocicni/ocicni.go generated vendored
View File

@ -55,9 +55,8 @@ func (plugin *cniNetworkPlugin) monitorNetDir() {
} }
if err = plugin.syncNetworkConfig(); err == nil { if err = plugin.syncNetworkConfig(); err == nil {
logrus.Debugf("CNI asynchronous setting succeeded") logrus.Infof("CNI asynchronous setting succeeded")
close(plugin.monitorNetDirChan) continue
return
} }
logrus.Errorf("CNI setting failed, continue monitoring: %v", err) logrus.Errorf("CNI setting failed, continue monitoring: %v", err)