Merge pull request #89912 from ahg-g/ahg-fwk

Move scheduler's NodeInfo and Listers types to framework pkg

test/e2e/framework/.import-restrictions

@@ -191,7 +191,6 @@
 				"k8s.io/kubernetes/pkg/scheduler/listers",
 				"k8s.io/kubernetes/pkg/scheduler/metrics",
 				"k8s.io/kubernetes/pkg/scheduler/nodeinfo",
-				"k8s.io/kubernetes/pkg/scheduler/types",
 				"k8s.io/kubernetes/pkg/scheduler/util",
 				"k8s.io/kubernetes/pkg/scheduler/volumebinder",
 				"k8s.io/kubernetes/pkg/security/apparmor",

test/e2e/framework/node/BUILD

@@ -10,7 +10,7 @@ go_library(
     importpath = "k8s.io/kubernetes/test/e2e/framework/node",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/scheduler/types: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",

test/e2e/framework/node/resource.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
-	schedulertypes "k8s.io/kubernetes/pkg/scheduler/types"
+	schedfwk "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
 	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 	"k8s.io/kubernetes/test/e2e/system"
 )
@@ -391,7 +391,7 @@ func isNodeUntaintedWithNonblocking(node *v1.Node, nonblockingTaints string) boo
 		},
 	}
 
-	nodeInfo := schedulertypes.NewNodeInfo()
+	nodeInfo := schedfwk.NewNodeInfo()
 
 	// Simple lookup for nonblocking taints based on comma-delimited list.
 	nonblockingTaintsMap := map[string]struct{}{}