Merge pull request #77313 from bjhaid/cleanup_kube_proxy

cmd/kube-proxy/app/BUILD

@@ -163,7 +163,6 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/apis/core:go_default_library",
         "//pkg/proxy/apis/config:go_default_library",
         "//pkg/util/configz:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

cmd/kube-proxy/app/server.go

@@ -329,11 +329,9 @@ func (o *Options) runLoop() error {
 	}()
 
 	for {
-		select {
-		case err := <-o.errCh:
-			if err != nil {
-				return err
-			}
+		err := <-o.errCh
+		if err != nil {
+			return err
 		}
 	}
 }

cmd/kube-proxy/app/server_others_test.go

@@ -29,8 +29,6 @@ import (
 func Test_getProxyMode(t *testing.T) {
 	var cases = []struct {
 		flag            string
-		annotationKey   string
-		annotationVal   string
 		iptablesVersion string
 		ipsetVersion    string
 		kmods           []string

cmd/kube-proxy/app/server_test.go

@@ -33,20 +33,11 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/diff"
 	componentbaseconfig "k8s.io/component-base/config"
-	api "k8s.io/kubernetes/pkg/apis/core"
 	kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config"
 	"k8s.io/kubernetes/pkg/util/configz"
 	utilpointer "k8s.io/utils/pointer"
 )
 
-type fakeNodeInterface struct {
-	node api.Node
-}
-
-func (fake *fakeNodeInterface) Get(hostname string, options metav1.GetOptions) (*api.Node, error) {
-	return &fake.node, nil
-}
-
 type fakeIPTablesVersioner struct {
 	version string // what to return
 	err     error  // what to return