feat: remove factory.Config from mustSetupScheduler

test/integration/scheduler_perf/util.go

@@ -18,22 +18,22 @@ package benchmark
 
 import (
 	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	coreinformers "k8s.io/client-go/informers/core/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	restclient "k8s.io/client-go/rest"
-	"k8s.io/kubernetes/pkg/scheduler/factory"
 	"k8s.io/kubernetes/test/integration/util"
 )
 
 // mustSetupScheduler starts the following components:
 // - k8s api server (a.k.a. master)
 // - scheduler
-// It returns scheduler config factory and destroyFunc which should be used to
+// It returns clientset and destroyFunc which should be used to
 // remove resources after finished.
 // Notes on rate limiter:
 //   - client rate limit is set to 5000.
-func mustSetupScheduler() (*factory.Config, util.ShutdownFunc, clientset.Interface) {
+func mustSetupScheduler() (util.ShutdownFunc, clientset.Interface) {
 	apiURL, apiShutdown := util.StartApiserver()
 	clientSet := clientset.NewForConfigOrDie(&restclient.Config{
 		Host:          apiURL,
@@ -41,26 +41,26 @@ func mustSetupScheduler() (*factory.Config, util.ShutdownFunc, clientset.Interfa
 		QPS:           5000.0,
 		Burst:         5000,
 	})
-	schedulerConfig, schedulerShutdown := util.StartScheduler(clientSet)
+	_, schedulerShutdown := util.StartScheduler(clientSet)
 
 	shutdownFunc := func() {
 		schedulerShutdown()
 		apiShutdown()
 	}
-	return schedulerConfig, shutdownFunc, clientSet
+
+	return shutdownFunc, clientSet
 }
 
-func getScheduledPods(clientset clientset.Interface) ([]*v1.Pod, error) {
-	podList, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{})
+func getScheduledPods(podInformer coreinformers.PodInformer) ([]*v1.Pod, error) {
+	pods, err := podInformer.Lister().List(labels.Everything())
 	if err != nil {
 		return nil, err
 	}
-	allPods := podList.Items
-	scheduled := make([]*v1.Pod, 0, len(allPods))
-	for i := range allPods {
-		pod := allPods[i]
+	scheduled := make([]*v1.Pod, 0, len(pods))
+	for i := range pods {
+		pod := pods[i]
 		if len(pod.Spec.NodeName) > 0 {
-			scheduled = append(scheduled, &pod)
+			scheduled = append(scheduled, pod)
 		}
 	}
 	return scheduled, nil