Skip to content

Commit

Permalink
Fix inconsistenty in finding cni binaries
Browse files Browse the repository at this point in the history
Fixes [kubernetes#46476]

Signed-off-by: Abhinav Dahiya <abhinav.dahiya@coreos.com>
  • Loading branch information
Abhinav Dahiya committed May 29, 2017
1 parent d9f3ea5 commit 73555e7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/kubelet/network/cni/cni.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
vendorDir := vendorCNIDir(vendorCNIDirPrefix, confType)
cninet := &libcni.CNIConfig{
Path: []string{binDir, vendorDir},
Path: []string{vendorDir, binDir},
}
network := &cniNetwork{name: confList.Name, NetworkConfig: confList, CNIConfig: cninet}
return network, nil
Expand Down

0 comments on commit 73555e7

Please sign in to comment.