From 34a7c2f6a65e2763d34b112dae57d1dad6712dbd Mon Sep 17 00:00:00 2001 From: Di Xu Date: Mon, 14 May 2018 11:06:27 +0800 Subject: [PATCH] remove deprecated/unused ProbeNetworkPlugins --- cmd/kubelet/app/BUILD | 3 --- cmd/kubelet/app/plugins.go | 15 --------------- 2 files changed, 18 deletions(-) diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index b2f3efbc79..62397f9fce 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -92,9 +92,6 @@ go_library( "//pkg/kubelet/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim:go_default_library", - "//pkg/kubelet/dockershim/network:go_default_library", - "//pkg/kubelet/dockershim/network/cni:go_default_library", - "//pkg/kubelet/dockershim/network/kubenet:go_default_library", "//pkg/kubelet/dockershim/remote:go_default_library", "//pkg/kubelet/eviction:go_default_library", "//pkg/kubelet/eviction/api:go_default_library", diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go index 22700b051f..b4e5cbe125 100644 --- a/cmd/kubelet/app/plugins.go +++ b/cmd/kubelet/app/plugins.go @@ -23,10 +23,6 @@ import ( _ "k8s.io/kubernetes/pkg/credentialprovider/azure" _ "k8s.io/kubernetes/pkg/credentialprovider/gcp" _ "k8s.io/kubernetes/pkg/credentialprovider/rancher" - // Network plugins - "k8s.io/kubernetes/pkg/kubelet/dockershim/network" - "k8s.io/kubernetes/pkg/kubelet/dockershim/network/cni" - "k8s.io/kubernetes/pkg/kubelet/dockershim/network/kubenet" // Volume plugins "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/aws_ebs" @@ -112,14 +108,3 @@ func ProbeVolumePlugins() []volume.VolumePlugin { func GetDynamicPluginProber(pluginDir string) volume.DynamicPluginProber { return flexvolume.GetDynamicPluginProber(pluginDir) } - -// ProbeNetworkPlugins collects all compiled-in plugins -func ProbeNetworkPlugins(cniConfDir string, cniBinDirs []string) []network.NetworkPlugin { - allPlugins := []network.NetworkPlugin{} - - // for each existing plugin, add to the list - allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(cniConfDir, cniBinDirs)...) - allPlugins = append(allPlugins, kubenet.NewPlugin(cniBinDirs)) - - return allPlugins -}