From 8031c8d97b215c4d3c26b4161205e456894063ee Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Fri, 2 Sep 2016 15:36:30 -0700 Subject: [PATCH] use golang native util to list dir --- pkg/kubelet/network/kubenet/kubenet_linux.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/network/kubenet/kubenet_linux.go b/pkg/kubelet/network/kubenet/kubenet_linux.go index 0ca229ff34c..0435dea32fb 100644 --- a/pkg/kubelet/network/kubenet/kubenet_linux.go +++ b/pkg/kubelet/network/kubenet/kubenet_linux.go @@ -31,6 +31,7 @@ import ( "github.com/golang/glog" "github.com/vishvananda/netlink" "github.com/vishvananda/netlink/nl" + "io/ioutil" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/componentconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -551,15 +552,14 @@ func (plugin *kubenetNetworkPlugin) checkCNIPlugin() bool { // checkCNIPluginInDir returns if all required cni plugins are placed in dir func (plugin *kubenetNetworkPlugin) checkCNIPluginInDir(dir string) bool { - output, err := plugin.execer.Command("ls", dir).CombinedOutput() + files, err := ioutil.ReadDir(dir) if err != nil { return false } - fields := strings.Fields(string(output)) for _, cniPlugin := range requiredCNIPlugins { found := false - for _, file := range fields { - if strings.TrimSpace(file) == cniPlugin { + for _, file := range files { + if strings.TrimSpace(file.Name()) == cniPlugin { found = true break }