diff --git a/pkg/scheduler/core/extender_test.go b/pkg/scheduler/core/extender_test.go index b6027ab13c2..36ec0a4c19e 100644 --- a/pkg/scheduler/core/extender_test.go +++ b/pkg/scheduler/core/extender_test.go @@ -286,7 +286,6 @@ func TestGenericSchedulerWithExtenders(t *testing.T) { emptySnapshot, extenders, informerFactory.Core().V1().PersistentVolumeClaims().Lister(), - false, schedulerapi.DefaultPercentageOfNodesToScore) podIgnored := &v1.Pod{} result, err := scheduler.Schedule(context.Background(), prof, framework.NewCycleState(), podIgnored) diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go index 599b6fe777f..4e3f5910507 100644 --- a/pkg/scheduler/core/generic_scheduler.go +++ b/pkg/scheduler/core/generic_scheduler.go @@ -120,7 +120,6 @@ type genericScheduler struct { extenders []framework.Extender nodeInfoSnapshot *internalcache.Snapshot pvcLister corelisters.PersistentVolumeClaimLister - disablePreemption bool percentageOfNodesToScore int32 nextStartNodeIndex int } @@ -630,14 +629,12 @@ func NewGenericScheduler( nodeInfoSnapshot *internalcache.Snapshot, extenders []framework.Extender, pvcLister corelisters.PersistentVolumeClaimLister, - disablePreemption bool, percentageOfNodesToScore int32) ScheduleAlgorithm { return &genericScheduler{ cache: cache, extenders: extenders, nodeInfoSnapshot: nodeInfoSnapshot, pvcLister: pvcLister, - disablePreemption: disablePreemption, percentageOfNodesToScore: percentageOfNodesToScore, } } diff --git a/pkg/scheduler/core/generic_scheduler_test.go b/pkg/scheduler/core/generic_scheduler_test.go index 402b9be5e42..4c5847ec2f0 100644 --- a/pkg/scheduler/core/generic_scheduler_test.go +++ b/pkg/scheduler/core/generic_scheduler_test.go @@ -750,7 +750,6 @@ func TestGenericScheduler(t *testing.T) { snapshot, []framework.Extender{}, pvcLister, - false, schedulerapi.DefaultPercentageOfNodesToScore) result, err := scheduler.Schedule(context.Background(), prof, framework.NewCycleState(), test.pod) if !reflect.DeepEqual(err, test.wErr) { @@ -776,7 +775,7 @@ func makeScheduler(nodes []*v1.Node) *genericScheduler { s := NewGenericScheduler( cache, emptySnapshot, - nil, nil, false, + nil, nil, schedulerapi.DefaultPercentageOfNodesToScore) cache.UpdateSnapshot(s.(*genericScheduler).nodeInfoSnapshot) return s.(*genericScheduler) @@ -1071,7 +1070,6 @@ func TestZeroRequest(t *testing.T) { emptySnapshot, []framework.Extender{}, nil, - false, schedulerapi.DefaultPercentageOfNodesToScore).(*genericScheduler) scheduler.nodeInfoSnapshot = snapshot diff --git a/pkg/scheduler/factory.go b/pkg/scheduler/factory.go index 1e63fec98aa..2fe58aa68dd 100644 --- a/pkg/scheduler/factory.go +++ b/pkg/scheduler/factory.go @@ -68,9 +68,6 @@ type Configurator struct { schedulerCache internalcache.Cache - // Disable pod preemption or not. - disablePreemption bool - // Always check all predicates even if the middle of one predicate fails. alwaysCheckAllPredicates bool @@ -184,7 +181,6 @@ func (c *Configurator) create() (*Scheduler, error) { c.nodeInfoSnapshot, extenders, c.informerFactory.Core().V1().PersistentVolumeClaims().Lister(), - c.disablePreemption, c.percentageOfNodesToScore, ) diff --git a/pkg/scheduler/factory_test.go b/pkg/scheduler/factory_test.go index 5e6769e893f..2e6ca3a1116 100644 --- a/pkg/scheduler/factory_test.go +++ b/pkg/scheduler/factory_test.go @@ -52,7 +52,6 @@ import ( ) const ( - disablePodPreemption = false podInitialBackoffDurationSeconds = 1 podMaxBackoffDurationSeconds = 10 testSchedulerName = "test-scheduler" @@ -453,7 +452,6 @@ func newConfigFactoryWithFrameworkRegistry( return &Configurator{ client: client, informerFactory: informerFactory, - disablePreemption: disablePodPreemption, percentageOfNodesToScore: schedulerapi.DefaultPercentageOfNodesToScore, podInitialBackoffSeconds: podInitialBackoffDurationSeconds, podMaxBackoffSeconds: podMaxBackoffDurationSeconds, diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index f2bdb84aa01..8c9a7e17424 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -825,7 +825,6 @@ func setupTestScheduler(queuedPodStore *clientcache.FIFO, scache internalcache.C internalcache.NewEmptySnapshot(), []framework.Extender{}, informerFactory.Core().V1().PersistentVolumeClaims().Lister(), - false, schedulerapi.DefaultPercentageOfNodesToScore, ) @@ -1174,7 +1173,6 @@ func TestSchedulerBinding(t *testing.T) { nil, test.extenders, nil, - false, 0, ) sched := Scheduler{