github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Change scheduler constructors to receive a plugin registry.

Browse Source
This commit is contained in:
Bobby (Babak) Salamat 2019-04-16 16:37:14 -07:00
parent 54afaf2326
commit 77824f5135
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-scheduler/app/server.go
View File

@ -46,6 +46,7 @@ import (
"k8s.io/kubernetes/pkg/scheduler" "k8s.io/kubernetes/pkg/scheduler"
"k8s.io/kubernetes/pkg/scheduler/algorithmprovider" "k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config" kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
"k8s.io/kubernetes/pkg/scheduler/metrics" "k8s.io/kubernetes/pkg/scheduler/metrics"
"k8s.io/kubernetes/pkg/util/configz" "k8s.io/kubernetes/pkg/util/configz"
utilflag "k8s.io/kubernetes/pkg/util/flag" utilflag "k8s.io/kubernetes/pkg/util/flag"
@ -174,6 +175,7 @@ func Run(cc schedulerserverconfig.CompletedConfig, stopCh <-chan struct{}) error
cc.Recorder, cc.Recorder,
cc.ComponentConfig.AlgorithmSource, cc.ComponentConfig.AlgorithmSource,
stopCh, stopCh,
framework.NewRegistry(),
scheduler.WithName(cc.ComponentConfig.SchedulerName), scheduler.WithName(cc.ComponentConfig.SchedulerName),
scheduler.WithHardPodAffinitySymmetricWeight(cc.ComponentConfig.HardPodAffinitySymmetricWeight), scheduler.WithHardPodAffinitySymmetricWeight(cc.ComponentConfig.HardPodAffinitySymmetricWeight),
scheduler.WithPreemptionDisabled(cc.ComponentConfig.DisablePreemption), scheduler.WithPreemptionDisabled(cc.ComponentConfig.DisablePreemption),

3
pkg/scheduler/scheduler.go
View File

@ -132,6 +132,7 @@ func New(client clientset.Interface,
recorder record.EventRecorder, recorder record.EventRecorder,
schedulerAlgorithmSource kubeschedulerconfig.SchedulerAlgorithmSource, schedulerAlgorithmSource kubeschedulerconfig.SchedulerAlgorithmSource,
stopCh <-chan struct{}, stopCh <-chan struct{},
registry framework.Registry,
opts ...func(o *schedulerOptions)) (*Scheduler, error) { opts ...func(o *schedulerOptions)) (*Scheduler, error) {
options := defaultSchedulerOptions options := defaultSchedulerOptions
@ -156,7 +157,7 @@ func New(client clientset.Interface,
DisablePreemption: options.disablePreemption, DisablePreemption: options.disablePreemption,
PercentageOfNodesToScore: options.percentageOfNodesToScore, PercentageOfNodesToScore: options.percentageOfNodesToScore,
BindTimeoutSeconds: options.bindTimeoutSeconds, BindTimeoutSeconds: options.bindTimeoutSeconds,
Registry: framework.NewRegistry(), Registry: registry,
}) })
var config *factory.Config var config *factory.Config
source := schedulerAlgorithmSource source := schedulerAlgorithmSource

2
test/integration/scheduler/scheduler_test.go
View File

@ -264,6 +264,7 @@ priorities: []
}, },
}, },
nil, nil,
schedulerframework.NewRegistry(),
scheduler.WithName(v1.DefaultSchedulerName), scheduler.WithName(v1.DefaultSchedulerName),
scheduler.WithHardPodAffinitySymmetricWeight(v1.DefaultHardPodAffinitySymmetricWeight), scheduler.WithHardPodAffinitySymmetricWeight(v1.DefaultHardPodAffinitySymmetricWeight),
scheduler.WithBindTimeoutSeconds(defaultBindTimeout), scheduler.WithBindTimeoutSeconds(defaultBindTimeout),
@ -332,6 +333,7 @@ func TestSchedulerCreationFromNonExistentConfigMap(t *testing.T) {
}, },
}, },
nil, nil,
schedulerframework.NewRegistry(),
scheduler.WithName(v1.DefaultSchedulerName), scheduler.WithName(v1.DefaultSchedulerName),
scheduler.WithHardPodAffinitySymmetricWeight(v1.DefaultHardPodAffinitySymmetricWeight), scheduler.WithHardPodAffinitySymmetricWeight(v1.DefaultHardPodAffinitySymmetricWeight),
scheduler.WithBindTimeoutSeconds(defaultBindTimeout)) scheduler.WithBindTimeoutSeconds(defaultBindTimeout))