From 77824f51356e167c60b0c567caffb1c6477c306c Mon Sep 17 00:00:00 2001 From: "Bobby (Babak) Salamat" Date: Tue, 16 Apr 2019 16:37:14 -0700 Subject: [PATCH] Change scheduler constructors to receive a plugin registry. --- cmd/kube-scheduler/app/server.go | 2 ++ pkg/scheduler/scheduler.go | 3 ++- test/integration/scheduler/scheduler_test.go | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/kube-scheduler/app/server.go b/cmd/kube-scheduler/app/server.go index be7db11e411..e4fd4a25a2f 100644 --- a/cmd/kube-scheduler/app/server.go +++ b/cmd/kube-scheduler/app/server.go @@ -46,6 +46,7 @@ import ( "k8s.io/kubernetes/pkg/scheduler" "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" 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/util/configz" utilflag "k8s.io/kubernetes/pkg/util/flag" @@ -174,6 +175,7 @@ func Run(cc schedulerserverconfig.CompletedConfig, stopCh <-chan struct{}) error cc.Recorder, cc.ComponentConfig.AlgorithmSource, stopCh, + framework.NewRegistry(), scheduler.WithName(cc.ComponentConfig.SchedulerName), scheduler.WithHardPodAffinitySymmetricWeight(cc.ComponentConfig.HardPodAffinitySymmetricWeight), scheduler.WithPreemptionDisabled(cc.ComponentConfig.DisablePreemption), diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 4c2b44bcb2b..6fb7151a32d 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -132,6 +132,7 @@ func New(client clientset.Interface, recorder record.EventRecorder, schedulerAlgorithmSource kubeschedulerconfig.SchedulerAlgorithmSource, stopCh <-chan struct{}, + registry framework.Registry, opts ...func(o *schedulerOptions)) (*Scheduler, error) { options := defaultSchedulerOptions @@ -156,7 +157,7 @@ func New(client clientset.Interface, DisablePreemption: options.disablePreemption, PercentageOfNodesToScore: options.percentageOfNodesToScore, BindTimeoutSeconds: options.bindTimeoutSeconds, - Registry: framework.NewRegistry(), + Registry: registry, }) var config *factory.Config source := schedulerAlgorithmSource diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index a3642662f61..038add1ed18 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -264,6 +264,7 @@ priorities: [] }, }, nil, + schedulerframework.NewRegistry(), scheduler.WithName(v1.DefaultSchedulerName), scheduler.WithHardPodAffinitySymmetricWeight(v1.DefaultHardPodAffinitySymmetricWeight), scheduler.WithBindTimeoutSeconds(defaultBindTimeout), @@ -332,6 +333,7 @@ func TestSchedulerCreationFromNonExistentConfigMap(t *testing.T) { }, }, nil, + schedulerframework.NewRegistry(), scheduler.WithName(v1.DefaultSchedulerName), scheduler.WithHardPodAffinitySymmetricWeight(v1.DefaultHardPodAffinitySymmetricWeight), scheduler.WithBindTimeoutSeconds(defaultBindTimeout))