Cleanup obsolete NodeInfo methods

test/e2e/apps/BUILD

@@ -1,9 +1,4 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
@@ -23,6 +18,7 @@ go_library(
         "wait.go",
     ],
     importpath = "k8s.io/kubernetes/test/e2e/apps",
+    visibility = ["//visibility:public"],
     deps = [
         "//pkg/api/v1/pod:go_default_library",
         "//pkg/apis/apps:go_default_library",
@@ -37,7 +33,6 @@ go_library(
         "//pkg/controller/replication:go_default_library",
         "//pkg/master/ports:go_default_library",
         "//pkg/scheduler/apis/config:go_default_library",
-        "//pkg/scheduler/framework/v1alpha1:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
         "//staging/src/k8s.io/api/batch/v1:go_default_library",
@@ -102,4 +97,5 @@ filegroup(
     name = "all-srcs",
     srcs = [":package-srcs"],
     tags = ["automanaged"],
+    visibility = ["//visibility:public"],
 )

test/e2e/apps/daemon_set.go

@@ -36,7 +36,6 @@ import (
 	podutil "k8s.io/kubernetes/pkg/api/v1/pod"
 	extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/controller/daemon"
-	schedfwk "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
 	"k8s.io/kubernetes/test/e2e/framework"
 	e2enode "k8s.io/kubernetes/test/e2e/framework/node"
 	e2eresource "k8s.io/kubernetes/test/e2e/framework/resource"
@@ -688,14 +687,7 @@ func checkAtLeastOneNewPod(c clientset.Interface, ns string, label map[string]st
 // canScheduleOnNode checks if a given DaemonSet can schedule pods on the given node
 func canScheduleOnNode(node v1.Node, ds *appsv1.DaemonSet) bool {
 	newPod := daemon.NewPod(ds, node.Name)
-	nodeInfo := schedfwk.NewNodeInfo()
-	nodeInfo.SetNode(&node)
-	taints, err := nodeInfo.Taints()
-	if err != nil {
-		framework.Failf("Can't test DaemonSet predicates for node %s: %v", node.Name, err)
-		return false
-	}
-	fitsNodeName, fitsNodeAffinity, fitsTaints := daemon.Predicates(newPod, &node, taints)
+	fitsNodeName, fitsNodeAffinity, fitsTaints := daemon.Predicates(newPod, &node, node.Spec.Taints)
 	return fitsNodeName && fitsNodeAffinity && fitsTaints
 }
 

test/e2e/framework/.import-restrictions

@@ -188,9 +188,7 @@
 				"k8s.io/kubernetes/pkg/scheduler/framework/plugins/noderesources",
 				"k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1",
 				"k8s.io/kubernetes/pkg/scheduler/internal/parallelize",
-				"k8s.io/kubernetes/pkg/scheduler/listers",
 				"k8s.io/kubernetes/pkg/scheduler/metrics",
-				"k8s.io/kubernetes/pkg/scheduler/nodeinfo",
 				"k8s.io/kubernetes/pkg/scheduler/util",
 				"k8s.io/kubernetes/pkg/scheduler/volumebinder",
 				"k8s.io/kubernetes/pkg/security/apparmor",

test/e2e/framework/node/BUILD

@@ -11,7 +11,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/controller:go_default_library",
-        "//pkg/scheduler/framework/v1alpha1:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
@@ -29,20 +28,6 @@ go_library(
     ],
 )
 
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-    visibility = ["//visibility:public"],
-)
-
 go_test(
     name = "go_default_test",
     srcs = ["wait_test.go"],
@@ -56,3 +41,17 @@ go_test(
         "//staging/src/k8s.io/client-go/testing:go_default_library",
     ],
 )
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)

test/e2e/framework/node/resource.go

@@ -32,7 +32,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/pkg/controller"
-	schedfwk "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
 	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 	"k8s.io/kubernetes/test/e2e/system"
 )
@@ -393,8 +392,6 @@ func isNodeUntaintedWithNonblocking(node *v1.Node, nonblockingTaints string) boo
 		},
 	}
 
-	nodeInfo := schedfwk.NewNodeInfo()
-
 	// Simple lookup for nonblocking taints based on comma-delimited list.
 	nonblockingTaintsMap := map[string]struct{}{}
 	for _, t := range strings.Split(nonblockingTaints, ",") {
@@ -403,6 +400,7 @@ func isNodeUntaintedWithNonblocking(node *v1.Node, nonblockingTaints string) boo
 		}
 	}
 
+	n := node
 	if len(nonblockingTaintsMap) > 0 {
 		nodeCopy := node.DeepCopy()
 		nodeCopy.Spec.Taints = []v1.Taint{}
@@ -411,18 +409,9 @@ func isNodeUntaintedWithNonblocking(node *v1.Node, nonblockingTaints string) boo
 				nodeCopy.Spec.Taints = append(nodeCopy.Spec.Taints, v)
 			}
 		}
-		nodeInfo.SetNode(nodeCopy)
-	} else {
-		nodeInfo.SetNode(node)
+		n = nodeCopy
 	}
-
-	taints, err := nodeInfo.Taints()
-	if err != nil {
-		e2elog.Failf("Can't test predicates for node %s: %v", node.Name, err)
-		return false
-	}
-
-	return toleratesTaintsWithNoScheduleNoExecuteEffects(taints, fakePod.Spec.Tolerations)
+	return toleratesTaintsWithNoScheduleNoExecuteEffects(n.Spec.Taints, fakePod.Spec.Tolerations)
 }
 
 func toleratesTaintsWithNoScheduleNoExecuteEffects(taints []v1.Taint, tolerations []v1.Toleration) bool {

test/integration/framework/BUILD

@@ -44,7 +44,6 @@ go_library(
         "//pkg/kubeapiserver:go_default_library",
         "//pkg/kubelet/client:go_default_library",
         "//pkg/master:go_default_library",
-        "//pkg/scheduler/framework/v1alpha1:go_default_library",
         "//pkg/util/env:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",

test/integration/framework/util.go

@@ -34,7 +34,6 @@ import (
 	"k8s.io/klog"
 	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	nodectlr "k8s.io/kubernetes/pkg/controller/nodelifecycle"
-	schedfwk "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
 	testutils "k8s.io/kubernetes/test/utils"
 )
 
@@ -250,8 +249,6 @@ func isNodeUntainted(node *v1.Node) bool {
 		},
 	}
 
-	nodeInfo := schedfwk.NewNodeInfo()
-
 	// Simple lookup for nonblocking taints based on comma-delimited list.
 	nonblockingTaintsMap := map[string]struct{}{}
 	for _, t := range strings.Split(nonblockingTaints, ",") {
@@ -260,6 +257,7 @@ func isNodeUntainted(node *v1.Node) bool {
 		}
 	}
 
+	n := node
 	if len(nonblockingTaintsMap) > 0 {
 		nodeCopy := node.DeepCopy()
 		nodeCopy.Spec.Taints = []v1.Taint{}
@@ -268,18 +266,10 @@ func isNodeUntainted(node *v1.Node) bool {
 				nodeCopy.Spec.Taints = append(nodeCopy.Spec.Taints, v)
 			}
 		}
-		nodeInfo.SetNode(nodeCopy)
-	} else {
-		nodeInfo.SetNode(node)
+		n = nodeCopy
 	}
 
-	taints, err := nodeInfo.Taints()
-	if err != nil {
-		klog.Fatalf("Can't test predicates for node %s: %v", node.Name, err)
-		return false
-	}
-
-	return v1helper.TolerationsTolerateTaintsWithFilter(fakePod.Spec.Tolerations, taints, func(t *v1.Taint) bool {
+	return v1helper.TolerationsTolerateTaintsWithFilter(fakePod.Spec.Tolerations, n.Spec.Taints, func(t *v1.Taint) bool {
 		return t.Effect == v1.TaintEffectNoExecute || t.Effect == v1.TaintEffectNoSchedule
 	})
 }