diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD index 5571efe085f..84d9298d55d 100644 --- a/pkg/kubelet/dockershim/BUILD +++ b/pkg/kubelet/dockershim/BUILD @@ -89,7 +89,7 @@ go_test( "//pkg/kubelet/dockertools:go_default_library", "//pkg/kubelet/dockertools/securitycontext:go_default_library", "//pkg/kubelet/network:go_default_library", - "//pkg/kubelet/network/mock_network:go_default_library", + "//pkg/kubelet/network/testing:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/kubelet/util/cache:go_default_library", "//pkg/security/apparmor:go_default_library", diff --git a/pkg/kubelet/dockershim/docker_service_test.go b/pkg/kubelet/dockershim/docker_service_test.go index 3e6d8c8bd8f..8d57f0a2eb8 100644 --- a/pkg/kubelet/dockershim/docker_service_test.go +++ b/pkg/kubelet/dockershim/docker_service_test.go @@ -32,14 +32,14 @@ import ( containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/kubelet/network" - "k8s.io/kubernetes/pkg/kubelet/network/mock_network" + nettest "k8s.io/kubernetes/pkg/kubelet/network/testing" "k8s.io/kubernetes/pkg/kubelet/util/cache" ) // newTestNetworkPlugin returns a mock plugin that implements network.NetworkPlugin -func newTestNetworkPlugin(t *testing.T) *mock_network.MockNetworkPlugin { +func newTestNetworkPlugin(t *testing.T) *nettest.MockNetworkPlugin { ctrl := gomock.NewController(t) - return mock_network.NewMockNetworkPlugin(ctrl) + return nettest.NewMockNetworkPlugin(ctrl) } func newTestDockerService() (*dockerService, *dockertools.FakeDockerClient, *clock.FakeClock) { diff --git a/pkg/kubelet/dockertools/BUILD b/pkg/kubelet/dockertools/BUILD index 3bf5402ad5c..397edb53051 100644 --- a/pkg/kubelet/dockertools/BUILD +++ b/pkg/kubelet/dockertools/BUILD @@ -112,7 +112,6 @@ go_test( "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/images:go_default_library", "//pkg/kubelet/network:go_default_library", - "//pkg/kubelet/network/mock_network:go_default_library", "//pkg/kubelet/network/testing:go_default_library", "//pkg/kubelet/prober/results:go_default_library", "//pkg/kubelet/types:go_default_library", diff --git a/pkg/kubelet/dockertools/docker_manager_linux_test.go b/pkg/kubelet/dockertools/docker_manager_linux_test.go index 0c61496281c..7f739f614a1 100644 --- a/pkg/kubelet/dockertools/docker_manager_linux_test.go +++ b/pkg/kubelet/dockertools/docker_manager_linux_test.go @@ -33,7 +33,7 @@ import ( kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/network" - "k8s.io/kubernetes/pkg/kubelet/network/mock_network" + nettest "k8s.io/kubernetes/pkg/kubelet/network/testing" "k8s.io/kubernetes/pkg/security/apparmor" utilstrings "k8s.io/kubernetes/pkg/util/strings" ) @@ -455,7 +455,8 @@ func TestGetPodStatusFromNetworkPlugin(t *testing.T) { for _, test := range cases { dm, fakeDocker := newTestDockerManager() ctrl := gomock.NewController(t) - fnp := mock_network.NewMockNetworkPlugin(ctrl) + defer ctrl.Finish() + fnp := nettest.NewMockNetworkPlugin(ctrl) dm.networkPlugin = fnp fakeDocker.SetFakeRunningContainers([]*FakeContainer{ diff --git a/pkg/kubelet/dockertools/docker_manager_test.go b/pkg/kubelet/dockertools/docker_manager_test.go index f3f484bf291..16a8d4ba45d 100644 --- a/pkg/kubelet/dockertools/docker_manager_test.go +++ b/pkg/kubelet/dockertools/docker_manager_test.go @@ -54,7 +54,6 @@ import ( containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/images" "k8s.io/kubernetes/pkg/kubelet/network" - "k8s.io/kubernetes/pkg/kubelet/network/mock_network" nettest "k8s.io/kubernetes/pkg/kubelet/network/testing" proberesults "k8s.io/kubernetes/pkg/kubelet/prober/results" "k8s.io/kubernetes/pkg/kubelet/types" @@ -1878,7 +1877,7 @@ func TestSyncPodGetsPodIPFromNetworkPlugin(t *testing.T) { dm.podInfraContainerImage = "pod_infra_image" ctrl := gomock.NewController(t) defer ctrl.Finish() - fnp := mock_network.NewMockNetworkPlugin(ctrl) + fnp := nettest.NewMockNetworkPlugin(ctrl) dm.networkPlugin = fnp pod := makePod("foo", &v1.PodSpec{ diff --git a/pkg/kubelet/network/mock_network/BUILD b/pkg/kubelet/network/mock_network/BUILD deleted file mode 100644 index 8f06ba40be0..00000000000 --- a/pkg/kubelet/network/mock_network/BUILD +++ /dev/null @@ -1,34 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["network_plugins.go"], - tags = ["automanaged"], - deps = [ - "//pkg/apis/componentconfig:go_default_library", - "//pkg/kubelet/container:go_default_library", - "//pkg/kubelet/network:go_default_library", - "//vendor:github.com/golang/mock/gomock", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/kubelet/network/testing/BUILD b/pkg/kubelet/network/testing/BUILD index 5a61b6d0ace..30f594a6aee 100644 --- a/pkg/kubelet/network/testing/BUILD +++ b/pkg/kubelet/network/testing/BUILD @@ -10,14 +10,21 @@ load( go_library( name = "go_default_library", - srcs = ["fake_host.go"], + srcs = [ + "fake_host.go", + "mock_network_plugin.go", + ], tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", + "//pkg/apis/componentconfig:go_default_library", "//pkg/client/clientset_generated/clientset: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/hostport:go_default_library", + "//vendor:github.com/golang/mock/gomock", + "//vendor:k8s.io/apimachinery/pkg/util/sets", ], ) diff --git a/pkg/kubelet/network/mock_network/network_plugins.go b/pkg/kubelet/network/testing/mock_network_plugin.go similarity index 98% rename from pkg/kubelet/network/mock_network/network_plugins.go rename to pkg/kubelet/network/testing/mock_network_plugin.go index fd7259d4a86..3eaa3fefe59 100644 --- a/pkg/kubelet/network/mock_network/network_plugins.go +++ b/pkg/kubelet/network/testing/mock_network_plugin.go @@ -14,11 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Generated code, generated via: `mockgen k8s.io/kubernetes/pkg/kubelet/network NetworkPlugin > $GOPATH/src/k8s.io/kubernetes/pkg/kubelet/network/mock_network/network_plugins.go` +// Generated code, generated via: `mockgen k8s.io/kubernetes/pkg/kubelet/network NetworkPlugin > $GOPATH/src/k8s.io/kubernetes/pkg/kubelet/network/testing/mock_network_plugin.go` // Edited by hand for boilerplate and gofmt. // TODO, this should be autogenerated/autoupdated by scripts. -package mock_network +package testing import ( gomock "github.com/golang/mock/gomock" diff --git a/pkg/kubelet/rkt/BUILD b/pkg/kubelet/rkt/BUILD index b2ce390c7af..679bbeb3467 100644 --- a/pkg/kubelet/rkt/BUILD +++ b/pkg/kubelet/rkt/BUILD @@ -76,7 +76,7 @@ go_test( "//pkg/kubelet/lifecycle:go_default_library", "//pkg/kubelet/network:go_default_library", "//pkg/kubelet/network/kubenet:go_default_library", - "//pkg/kubelet/network/mock_network:go_default_library", + "//pkg/kubelet/network/testing:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/util/exec:go_default_library", "//vendor:github.com/appc/spec/schema", diff --git a/pkg/kubelet/rkt/rkt_test.go b/pkg/kubelet/rkt/rkt_test.go index e712aaba0bd..8902e2a671e 100644 --- a/pkg/kubelet/rkt/rkt_test.go +++ b/pkg/kubelet/rkt/rkt_test.go @@ -43,7 +43,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/network" "k8s.io/kubernetes/pkg/kubelet/network/kubenet" - "k8s.io/kubernetes/pkg/kubelet/network/mock_network" + nettest "k8s.io/kubernetes/pkg/kubelet/network/testing" "k8s.io/kubernetes/pkg/kubelet/types" utilexec "k8s.io/kubernetes/pkg/util/exec" ) @@ -583,7 +583,7 @@ func TestGetPodStatus(t *testing.T) { defer ctrl.Finish() fr := newFakeRktInterface() fs := newFakeSystemd() - fnp := mock_network.NewMockNetworkPlugin(ctrl) + fnp := nettest.NewMockNetworkPlugin(ctrl) fos := &containertesting.FakeOS{} frh := &fakeRuntimeHelper{} r := &Runtime{