github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inconsistenty in finding cni binaries

Browse Source 
Fixes [#46476]

Signed-off-by: Abhinav Dahiya <abhinav.dahiya@coreos.com>
This commit is contained in:
Abhinav Dahiya 2017-05-29 16:58:45 -07:00
parent d9f3ea5191
commit 73555e7ce9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/network/cni/cni.go
View File

@ -134,7 +134,7 @@ func getDefaultCNINetwork(pluginDir, binDir, vendorCNIDirPrefix string) (*cniNet
// Search for vendor-specific plugins as well as default plugins in the CNI codebase. // Search for vendor-specific plugins as well as default plugins in the CNI codebase.
vendorDir := vendorCNIDir(vendorCNIDirPrefix, confType) vendorDir := vendorCNIDir(vendorCNIDirPrefix, confType)
cninet := &libcni.CNIConfig{ cninet := &libcni.CNIConfig{
Path: []string{binDir, vendorDir}, Path: []string{vendorDir, binDir},
} }
network := &cniNetwork{name: confList.Name, NetworkConfig: confList, CNIConfig: cninet} network := &cniNetwork{name: confList.Name, NetworkConfig: confList, CNIConfig: cninet}
return network, nil return network, nil