opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update ocicni vendor to pick up bugfixes

Browse Source 
Signed-off-by: Matthew Heon <mheon@redhat.com>

Closes: #991
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-06-25 11:49:20 -04:00
committed by Atomic Bot
parent e89bbd6068
commit b62b1cae42
4 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,9 @@ func (plugin *cniNetworkPlugin) monitorNetDir() {
logrus.Errorf("CNI setting failed, continue monitoring: %v", err) logrus.Errorf("CNI setting failed, continue monitoring: %v", err)
case err := <-watcher.Errors: case err := <-watcher.Errors:
if err == nil {
continue
}
logrus.Errorf("CNI monitoring error %v", err) logrus.Errorf("CNI monitoring error %v", err)
close(plugin.monitorNetDirChan) close(plugin.monitorNetDirChan)
return return

6
vendor/github.com/cri-o/ocicni/pkg/ocicni/types.go generated vendored
View File

@ -9,12 +9,6 @@ const (
DefaultInterfaceName = "eth0" DefaultInterfaceName = "eth0"
// CNIPluginName is the default name of the plugin // CNIPluginName is the default name of the plugin
CNIPluginName = "cni" CNIPluginName = "cni"
// DefaultNetDir is the place to look for CNI Network
DefaultNetDir = "/etc/cni/net.d"
// DefaultCNIDir is the place to look for cni config files
DefaultCNIDir = "/opt/cni/bin"
// VendorCNIDirTemplate is the template for looking up vendor specific cni config/executable files
VendorCNIDirTemplate = "%s/opt/%s/bin"
) )
// PortMapping maps to the standard CNI portmapping Capability // PortMapping maps to the standard CNI portmapping Capability

12
vendor/github.com/cri-o/ocicni/pkg/ocicni/types_unix.go generated vendored Normal file
View File

@ -0,0 +1,12 @@
// +build !windows
package ocicni
const (
// DefaultNetDir is the place to look for CNI Network
DefaultNetDir = "/etc/cni/net.d"
// DefaultCNIDir is the place to look for cni config files
DefaultCNIDir = "/opt/cni/bin"
// VendorCNIDirTemplate is the template for looking up vendor specific cni config/executable files
VendorCNIDirTemplate = "%s/opt/%s/bin"
)

12
vendor/github.com/cri-o/ocicni/pkg/ocicni/types_windows.go generated vendored Normal file
View File

@ -0,0 +1,12 @@
// +build windows
package ocicni
const (
// DefaultNetDir is the place to look for CNI Network
DefaultNetDir = "C:\\cni\\etc\\net.d"
// DefaultCNIDir is the place to look for cni config files
DefaultCNIDir = "C:\\cni\\bin"
// VendorCNIDirTemplate is the template for looking up vendor specific cni config/executable files
VendorCNIDirTemplate = "C:\\cni\\%s\\opt\\%s\\bin" // XXX(vbatts) Not sure what to do here ...
)