Merge pull request #50179 from k82cn/mv_node_testutils

Automatic merge from submit-queue (batch tested with PRs 50254, 50174, 50179)

Moved node/testutil to upper dir.

**What this PR does / why we need it**:
Moved node/testutil to upper directory (`pkg/controller`); it's used by several controllers, and we need to test some helper func in `pkg/controller`.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: part of #49522

**Release note**:

```release-note
N/A
```

hack/.golint_failures

@@ -182,7 +182,6 @@ pkg/controller/job
 pkg/controller/namespace
 pkg/controller/namespace/deletion
 pkg/controller/node
-pkg/controller/node/testutil
 pkg/controller/podautoscaler
 pkg/controller/podautoscaler/metrics
 pkg/controller/podgc

pkg/controller/BUILD

@@ -20,7 +20,7 @@ go_test(
         "//pkg/api:go_default_library",
         "//pkg/api/install:go_default_library",
         "//pkg/api/testapi:go_default_library",
-        "//pkg/controller/node/testutil:go_default_library",
+        "//pkg/controller/testutil:go_default_library",
         "//pkg/securitycontext:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
@@ -128,6 +128,7 @@ filegroup(
         "//pkg/controller/service:all-srcs",
         "//pkg/controller/serviceaccount:all-srcs",
         "//pkg/controller/statefulset:all-srcs",
+        "//pkg/controller/testutil:all-srcs",
         "//pkg/controller/ttl:all-srcs",
         "//pkg/controller/volume/attachdetach:all-srcs",
         "//pkg/controller/volume/events:all-srcs",

pkg/controller/cloud/BUILD

@@ -43,7 +43,7 @@ go_test(
         "//pkg/cloudprovider:go_default_library",
         "//pkg/cloudprovider/providers/fake:go_default_library",
         "//pkg/controller:go_default_library",
-        "//pkg/controller/node/testutil:go_default_library",
+        "//pkg/controller/testutil:go_default_library",
         "//pkg/kubelet/apis:go_default_library",
         "//plugin/pkg/scheduler/algorithm:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",

pkg/controller/cloud/node_controller_test.go

@@ -34,7 +34,7 @@ import (
 	"k8s.io/kubernetes/pkg/cloudprovider"
 	fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
 	"k8s.io/kubernetes/pkg/controller"
-	"k8s.io/kubernetes/pkg/controller/node/testutil"
+	"k8s.io/kubernetes/pkg/controller/testutil"
 	kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
 	"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
 )

pkg/controller/controller_utils_test.go

@@ -45,7 +45,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/install"
 	"k8s.io/kubernetes/pkg/api/testapi"
-	"k8s.io/kubernetes/pkg/controller/node/testutil"
+	"k8s.io/kubernetes/pkg/controller/testutil"
 	"k8s.io/kubernetes/pkg/securitycontext"
 )
 

pkg/controller/node/BUILD

@@ -24,7 +24,7 @@ go_test(
         "//pkg/cloudprovider:go_default_library",
         "//pkg/cloudprovider/providers/fake:go_default_library",
         "//pkg/controller:go_default_library",
-        "//pkg/controller/node/testutil:go_default_library",
+        "//pkg/controller/testutil:go_default_library",
         "//pkg/kubelet/apis:go_default_library",
         "//pkg/util/node:go_default_library",
         "//pkg/util/taints:go_default_library",
@@ -115,9 +115,6 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [
+    srcs = [":package-srcs"],
-        ":package-srcs",
-        "//pkg/controller/node/testutil:all-srcs",
-    ],
     tags = ["automanaged"],
 )

pkg/controller/node/cidr_allocator_test.go

@@ -25,7 +25,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/kubernetes/pkg/controller/node/testutil"
+	"k8s.io/kubernetes/pkg/controller/testutil"
 )
 
 const (

pkg/controller/node/nodecontroller_test.go

@@ -39,7 +39,7 @@ import (
 	"k8s.io/kubernetes/pkg/cloudprovider"
 	fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
 	"k8s.io/kubernetes/pkg/controller"
-	"k8s.io/kubernetes/pkg/controller/node/testutil"
+	"k8s.io/kubernetes/pkg/controller/testutil"
 	kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
 	"k8s.io/kubernetes/pkg/util/node"
 	taintutils "k8s.io/kubernetes/pkg/util/taints"

pkg/controller/node/taint_controller_test.go

@@ -24,7 +24,7 @@ import (
 
 	"k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/kubernetes/pkg/controller/node/testutil"
+	"k8s.io/kubernetes/pkg/controller/testutil"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clienttesting "k8s.io/client-go/testing"

pkg/controller/podgc/BUILD

@@ -39,7 +39,7 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/controller:go_default_library",
-        "//pkg/controller/node/testutil:go_default_library",
+        "//pkg/controller/testutil:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",

pkg/controller/podgc/gc_controller_test.go

@@ -30,7 +30,7 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/kubernetes/pkg/controller"
-	"k8s.io/kubernetes/pkg/controller/node/testutil"
+	"k8s.io/kubernetes/pkg/controller/testutil"
 )
 
 type FakeController struct{}

pkg/controller/testutil/test_utils.go

@@ -68,30 +68,31 @@ type FakeNodeHandler struct {
 	DeleteWaitChan chan struct{}
 }
 
+// FakeLegacyHandler is a fake implemtation of CoreV1Interface.
 type FakeLegacyHandler struct {
 	v1core.CoreV1Interface
 	n *FakeNodeHandler
 }
 
 // GetUpdatedNodesCopy returns a slice of Nodes with updates applied.
-func (c *FakeNodeHandler) GetUpdatedNodesCopy() []*v1.Node {
+func (m *FakeNodeHandler) GetUpdatedNodesCopy() []*v1.Node {
-	c.lock.Lock()
+	m.lock.Lock()
-	defer c.lock.Unlock()
+	defer m.lock.Unlock()
-	updatedNodesCopy := make([]*v1.Node, len(c.UpdatedNodes), len(c.UpdatedNodes))
+	updatedNodesCopy := make([]*v1.Node, len(m.UpdatedNodes), len(m.UpdatedNodes))
-	for i, ptr := range c.UpdatedNodes {
+	for i, ptr := range m.UpdatedNodes {
 		updatedNodesCopy[i] = ptr
 	}
 	return updatedNodesCopy
 }
 
 // Core returns fake CoreInterface.
-func (c *FakeNodeHandler) Core() v1core.CoreV1Interface {
+func (m *FakeNodeHandler) Core() v1core.CoreV1Interface {
-	return &FakeLegacyHandler{c.Clientset.Core(), c}
+	return &FakeLegacyHandler{m.Clientset.Core(), m}
 }
 
 // CoreV1 returns fake CoreV1Interface
-func (c *FakeNodeHandler) CoreV1() v1core.CoreV1Interface {
+func (m *FakeNodeHandler) CoreV1() v1core.CoreV1Interface {
-	return &FakeLegacyHandler{c.Clientset.CoreV1(), c}
+	return &FakeLegacyHandler{m.Clientset.CoreV1(), m}
 }
 
 // Nodes return fake NodeInterfaces.
@@ -115,9 +116,8 @@ func (m *FakeNodeHandler) Create(node *v1.Node) (*v1.Node, error) {
 		nodeCopy := *node
 		m.CreatedNodes = append(m.CreatedNodes, &nodeCopy)
 		return node, nil
-	} else {
-		return nil, errors.New("Create error.")
 	}
+	return nil, errors.New("create error")
 }
 
 // Get returns a Node from the fake store.