From fa390534126e35fc197ac2ef909d86499ae8c1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Osipiuk?= Date: Mon, 3 Sep 2018 19:12:01 +0200 Subject: [PATCH] Add back predicate related accessors to scheduler.Configurator --- pkg/scheduler/scheduler.go | 4 ++++ pkg/scheduler/testutil.go | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 7e038a45a0f..87fe364db84 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -88,6 +88,10 @@ type Configurator interface { // Exposed for testing MakeDefaultErrorFunc(backoff *util.PodBackoff, podQueue core.SchedulingQueue) func(pod *v1.Pod, err error) + // Predicate related accessors to be exposed for use by k8s.io/autoscaler/cluster-autoscaler + GetPredicateMetadataProducer() (algorithm.PredicateMetadataProducer, error) + GetPredicates(predicateKeys sets.String) (map[string]algorithm.FitPredicate, error) + // Needs to be exposed for things like integration tests where we want to make fake nodes. GetNodeLister() corelisters.NodeLister // Exposed for testing diff --git a/pkg/scheduler/testutil.go b/pkg/scheduler/testutil.go index 552068d1fda..ded22c0efdd 100644 --- a/pkg/scheduler/testutil.go +++ b/pkg/scheduler/testutil.go @@ -17,6 +17,8 @@ limitations under the License. package scheduler import ( + "fmt" + "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" @@ -32,6 +34,16 @@ type FakeConfigurator struct { Config *Config } +// GetPredicateMetadataProducer is not implemented yet. +func (fc *FakeConfigurator) GetPredicateMetadataProducer() (algorithm.PredicateMetadataProducer, error) { + return nil, fmt.Errorf("not implemented") +} + +// GetPredicates is not implemented yet. +func (fc *FakeConfigurator) GetPredicates(predicateKeys sets.String) (map[string]algorithm.FitPredicate, error) { + return nil, fmt.Errorf("not implemented") +} + // GetHardPodAffinitySymmetricWeight is not implemented yet. func (fc *FakeConfigurator) GetHardPodAffinitySymmetricWeight() int32 { panic("not implemented")