Removed old scheduler constructor.

plugin/pkg/scheduler/scheduler_test.go

@@ -154,31 +154,34 @@ func TestScheduler(t *testing.T) {
 		var gotPod *v1.Pod
 		var gotAssumedPod *v1.Pod
 		var gotBinding *v1.Binding
-		c := &Config{
-			SchedulerCache: &schedulertesting.FakeCache{
-				AssumeFunc: func(pod *v1.Pod) {
-					gotAssumedPod = pod
+		configurator := &FakeConfigurator{
+			Config: &Config{
+				SchedulerCache: &schedulertesting.FakeCache{
+					AssumeFunc: func(pod *v1.Pod) {
+						gotAssumedPod = pod
+					},
 				},
+				NodeLister: schedulertesting.FakeNodeLister(
+					[]*v1.Node{&testNode},
+				),
+				Algorithm: item.algo,
+				Binder: fakeBinder{func(b *v1.Binding) error {
+					gotBinding = b
+					return item.injectBindError
+				}},
+				PodConditionUpdater: fakePodConditionUpdater{},
+				Error: func(p *v1.Pod, err error) {
+					gotPod = p
+					gotError = err
+				},
+				NextPod: func() *v1.Pod {
+					return item.sendPod
+				},
+				Recorder: eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "scheduler"}),
 			},
-			NodeLister: schedulertesting.FakeNodeLister(
-				[]*v1.Node{&testNode},
-			),
-			Algorithm: item.algo,
-			Binder: fakeBinder{func(b *v1.Binding) error {
-				gotBinding = b
-				return item.injectBindError
-			}},
-			PodConditionUpdater: fakePodConditionUpdater{},
-			Error: func(p *v1.Pod, err error) {
-				gotPod = p
-				gotError = err
-			},
-			NextPod: func() *v1.Pod {
-				return item.sendPod
-			},
-			Recorder: eventBroadcaster.NewRecorder(api.Scheme, clientv1.EventSource{Component: "scheduler"}),
 		}
-		s := New(c)
+
+		s, _ := NewFromConfigurator(configurator, nil...)
 		called := make(chan struct{})
 		events := eventBroadcaster.StartEventWatcher(func(e *clientv1.Event) {
 			if e, a := item.eventReason, e.Reason; e != a {
@@ -495,24 +498,29 @@ func setupTestScheduler(queuedPodStore *clientcache.FIFO, scache schedulercache.
 		[]algorithm.SchedulerExtender{})
 	bindingChan := make(chan *v1.Binding, 1)
 	errChan := make(chan error, 1)
-	cfg := &Config{
-		SchedulerCache: scache,
-		NodeLister:     nodeLister,
-		Algorithm:      algo,
-		Binder: fakeBinder{func(b *v1.Binding) error {
-			bindingChan <- b
-			return nil
-		}},
-		NextPod: func() *v1.Pod {
-			return clientcache.Pop(queuedPodStore).(*v1.Pod)
+	configurator := &FakeConfigurator{
+		Config: &Config{
+			SchedulerCache: scache,
+			NodeLister:     nodeLister,
+			Algorithm:      algo,
+			Binder: fakeBinder{func(b *v1.Binding) error {
+				bindingChan <- b
+				return nil
+			}},
+			NextPod: func() *v1.Pod {
+				return clientcache.Pop(queuedPodStore).(*v1.Pod)
+			},
+			Error: func(p *v1.Pod, err error) {
+				errChan <- err
+			},
+			Recorder:            &record.FakeRecorder{},
+			PodConditionUpdater: fakePodConditionUpdater{},
 		},
-		Error: func(p *v1.Pod, err error) {
-			errChan <- err
-		},
-		Recorder:            &record.FakeRecorder{},
-		PodConditionUpdater: fakePodConditionUpdater{},
 	}
-	return New(cfg), bindingChan, errChan
+
+	sched, _ := NewFromConfigurator(configurator, nil...)
+
+	return sched, bindingChan, errChan
 }
 
 func setupTestSchedulerLongBindingWithRetry(queuedPodStore *clientcache.FIFO, scache schedulercache.Cache, nodeLister schedulertesting.FakeNodeLister, predicateMap map[string]algorithm.FitPredicate, stop chan struct{}, bindingTime time.Duration) (*Scheduler, chan *v1.Binding) {
@@ -525,24 +533,29 @@ func setupTestSchedulerLongBindingWithRetry(queuedPodStore *clientcache.FIFO, sc
 		algorithm.EmptyMetadataProducer,
 		[]algorithm.SchedulerExtender{})
 	bindingChan := make(chan *v1.Binding, 2)
-	cfg := &Config{
-		SchedulerCache: scache,
-		NodeLister:     nodeLister,
-		Algorithm:      algo,
-		Binder: fakeBinder{func(b *v1.Binding) error {
-			time.Sleep(bindingTime)
-			bindingChan <- b
-			return nil
-		}},
-		NextPod: func() *v1.Pod {
-			return clientcache.Pop(queuedPodStore).(*v1.Pod)
+	configurator := &FakeConfigurator{
+		Config: &Config{
+			SchedulerCache: scache,
+			NodeLister:     nodeLister,
+			Algorithm:      algo,
+			Binder: fakeBinder{func(b *v1.Binding) error {
+				time.Sleep(bindingTime)
+				bindingChan <- b
+				return nil
+			}},
+			NextPod: func() *v1.Pod {
+				return clientcache.Pop(queuedPodStore).(*v1.Pod)
+			},
+			Error: func(p *v1.Pod, err error) {
+				queuedPodStore.AddIfNotPresent(p)
+			},
+			Recorder:            &record.FakeRecorder{},
+			PodConditionUpdater: fakePodConditionUpdater{},
+			StopEverything:      stop,
 		},
-		Error: func(p *v1.Pod, err error) {
-			queuedPodStore.AddIfNotPresent(p)
-		},
-		Recorder:            &record.FakeRecorder{},
-		PodConditionUpdater: fakePodConditionUpdater{},
-		StopEverything:      stop,
 	}
-	return New(cfg), bindingChan
+
+	sched, _ := NewFromConfigurator(configurator, nil...)
+
+	return sched, bindingChan
 }