diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 6525f6d2a73..4f21b5d85ca 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -596,7 +596,6 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub machineInfo, klet.podManager, kubeDeps.OSInterface, - klet.networkPlugin, klet, klet.httpClient, imageBackOff, diff --git a/pkg/kubelet/kuberuntime/BUILD b/pkg/kubelet/kuberuntime/BUILD index fc15828dbb2..97999d047c1 100644 --- a/pkg/kubelet/kuberuntime/BUILD +++ b/pkg/kubelet/kuberuntime/BUILD @@ -39,7 +39,6 @@ go_library( "//pkg/kubelet/images:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", "//pkg/kubelet/metrics:go_default_library", - "//pkg/kubelet/network:go_default_library", "//pkg/kubelet/prober/results:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/kubelet/types:go_default_library", @@ -82,13 +81,10 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/apis/componentconfig:go_default_library", "//pkg/kubelet/api/testing:go_default_library", "//pkg/kubelet/api/v1alpha1/runtime:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", - "//pkg/kubelet/network:go_default_library", - "//pkg/kubelet/network/testing:go_default_library", "//vendor/github.com/golang/mock/gomock:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go b/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go index 070ef9e9877..ec4f067fa3d 100644 --- a/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/fake_kuberuntime_manager.go @@ -30,7 +30,6 @@ import ( kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/images" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/pkg/kubelet/network" proberesults "k8s.io/kubernetes/pkg/kubelet/prober/results" ) @@ -57,7 +56,7 @@ func (f *fakePodGetter) GetPodByUID(uid types.UID) (*v1.Pod, bool) { return pod, found } -func NewFakeKubeRuntimeManager(runtimeService internalapi.RuntimeService, imageService internalapi.ImageManagerService, machineInfo *cadvisorapi.MachineInfo, networkPlugin network.NetworkPlugin, osInterface kubecontainer.OSInterface, runtimeHelper kubecontainer.RuntimeHelper) (*kubeGenericRuntimeManager, error) { +func NewFakeKubeRuntimeManager(runtimeService internalapi.RuntimeService, imageService internalapi.ImageManagerService, machineInfo *cadvisorapi.MachineInfo, osInterface kubecontainer.OSInterface, runtimeHelper kubecontainer.RuntimeHelper) (*kubeGenericRuntimeManager, error) { recorder := &record.FakeRecorder{} kubeRuntimeManager := &kubeGenericRuntimeManager{ recorder: recorder, @@ -66,7 +65,6 @@ func NewFakeKubeRuntimeManager(runtimeService internalapi.RuntimeService, imageS containerRefManager: kubecontainer.NewRefManager(), machineInfo: machineInfo, osInterface: osInterface, - networkPlugin: networkPlugin, runtimeHelper: runtimeHelper, runtimeService: runtimeService, imageService: imageService, diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index 45208472b2c..3ca3f61a133 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -40,7 +40,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/images" "k8s.io/kubernetes/pkg/kubelet/lifecycle" - "k8s.io/kubernetes/pkg/kubelet/network" proberesults "k8s.io/kubernetes/pkg/kubelet/prober/results" "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/cache" @@ -97,9 +96,6 @@ type kubeGenericRuntimeManager struct { // If true, enforce container cpu limits with CFS quota support cpuCFSQuota bool - // Network plugin. - networkPlugin network.NetworkPlugin - // wrapped image puller. imagePuller images.ImageManager @@ -125,7 +121,6 @@ func NewKubeGenericRuntimeManager( machineInfo *cadvisorapi.MachineInfo, podGetter podGetter, osInterface kubecontainer.OSInterface, - networkPlugin network.NetworkPlugin, runtimeHelper kubecontainer.RuntimeHelper, httpClient types.HttpGetter, imageBackOff *flowcontrol.Backoff, @@ -143,7 +138,6 @@ func NewKubeGenericRuntimeManager( containerRefManager: containerRefManager, machineInfo: machineInfo, osInterface: osInterface, - networkPlugin: networkPlugin, runtimeHelper: runtimeHelper, runtimeService: newInstrumentedRuntimeService(runtimeService), imageService: newInstrumentedImageManagerService(imageService), diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go index 1b29e2422ea..65ec763e6a7 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go @@ -29,13 +29,10 @@ import ( kubetypes "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/apis/componentconfig" apitest "k8s.io/kubernetes/pkg/kubelet/api/testing" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" - "k8s.io/kubernetes/pkg/kubelet/network" - nettest "k8s.io/kubernetes/pkg/kubelet/network/testing" ) var ( @@ -49,16 +46,8 @@ func createTestRuntimeManager() (*apitest.FakeRuntimeService, *apitest.FakeImage // data in machineInfo is not used. If burstable containers are used in unit test in the future, // we may want to set memory capacity. machineInfo := &cadvisorapi.MachineInfo{} - networkPlugin, _ := network.InitNetworkPlugin( - []network.NetworkPlugin{}, - "", - nettest.NewFakeHost(nil), - componentconfig.HairpinNone, - "10.0.0.0/8", - network.UseDefaultMTU, - ) osInterface := &containertest.FakeOS{} - manager, err := NewFakeKubeRuntimeManager(fakeRuntimeService, fakeImageService, machineInfo, networkPlugin, osInterface, &containertest.FakeRuntimeHelper{}) + manager, err := NewFakeKubeRuntimeManager(fakeRuntimeService, fakeImageService, machineInfo, osInterface, &containertest.FakeRuntimeHelper{}) return fakeRuntimeService, fakeImageService, manager, err }