github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32217 from freehan/kubenetcheck

Browse Source 
Automatic merge from submit-queue

nit fixes

Do not merge yet. Wait till it gets bigger. 

fix included:
1. use golang native util to list dir
This commit is contained in:
Kubernetes Submit Queue 2016-09-24 03:28:28 -07:00 committed by GitHub
commit 9c5bf904c2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/network/kubenet/kubenet_linux.go
View File

@ -31,6 +31,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
"github.com/vishvananda/netlink/nl" "github.com/vishvananda/netlink/nl"
"io/ioutil"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/componentconfig"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
@ -552,15 +553,14 @@ func (plugin *kubenetNetworkPlugin) checkCNIPlugin() bool {
// checkCNIPluginInDir returns if all required cni plugins are placed in dir // checkCNIPluginInDir returns if all required cni plugins are placed in dir
func (plugin *kubenetNetworkPlugin) checkCNIPluginInDir(dir string) bool { func (plugin *kubenetNetworkPlugin) checkCNIPluginInDir(dir string) bool {
output, err := plugin.execer.Command("ls", dir).CombinedOutput() files, err := ioutil.ReadDir(dir)
if err != nil { if err != nil {
return false return false
} }
fields := strings.Fields(string(output))
for _, cniPlugin := range requiredCNIPlugins { for _, cniPlugin := range requiredCNIPlugins {
found := false found := false
for _, file := range fields { for _, file := range files {
if strings.TrimSpace(file) == cniPlugin { if strings.TrimSpace(file.Name()) == cniPlugin {
found = true found = true
break break
} }