From fbf3d2b84cae205319fbbac5115bc7d8e1df1f4e Mon Sep 17 00:00:00 2001 From: Jonathan Basseri Date: Wed, 15 Aug 2018 17:05:49 -0700 Subject: [PATCH] Delete dead code in pkg/scheduler. This deletes some unused functions from the `Configurator` interface. --- pkg/scheduler/scheduler.go | 9 ++++----- pkg/scheduler/testutil.go | 27 --------------------------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index fe66270215f..e8ec9d1e334 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -78,17 +78,16 @@ func (sched *Scheduler) StopEverything() { // construct a new scheduler. An implementation of this can be seen in // factory.go. type Configurator interface { - GetPriorityFunctionConfigs(priorityKeys sets.String) ([]algorithm.PriorityConfig, error) - GetPriorityMetadataProducer() (algorithm.PriorityMetadataProducer, error) - GetPredicateMetadataProducer() (algorithm.PredicateMetadataProducer, error) - GetPredicates(predicateKeys sets.String) (map[string]algorithm.FitPredicate, error) + // Exposed for testing GetHardPodAffinitySymmetricWeight() int32 - GetSchedulerName() string + // Exposed for testing MakeDefaultErrorFunc(backoff *util.PodBackoff, podQueue core.SchedulingQueue) func(pod *v1.Pod, err error) // Needs to be exposed for things like integration tests where we want to make fake nodes. GetNodeLister() corelisters.NodeLister + // Exposed for testing GetClient() clientset.Interface + // Exposed for testing GetScheduledPodLister() corelisters.PodLister Create() (*Config, error) diff --git a/pkg/scheduler/testutil.go b/pkg/scheduler/testutil.go index 4302b913b5f..552068d1fda 100644 --- a/pkg/scheduler/testutil.go +++ b/pkg/scheduler/testutil.go @@ -17,8 +17,6 @@ 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" @@ -34,36 +32,11 @@ type FakeConfigurator struct { Config *Config } -// GetPriorityFunctionConfigs is not implemented yet. -func (fc *FakeConfigurator) GetPriorityFunctionConfigs(priorityKeys sets.String) ([]algorithm.PriorityConfig, error) { - return nil, fmt.Errorf("not implemented") -} - -// GetPriorityMetadataProducer is not implemented yet. -func (fc *FakeConfigurator) GetPriorityMetadataProducer() (algorithm.PriorityMetadataProducer, error) { - return nil, fmt.Errorf("not implemented") -} - -// 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") } -// GetSchedulerName is not implemented yet. -func (fc *FakeConfigurator) GetSchedulerName() string { - panic("not implemented") -} - // MakeDefaultErrorFunc is not implemented yet. func (fc *FakeConfigurator) MakeDefaultErrorFunc(backoff *util.PodBackoff, podQueue core.SchedulingQueue) func(pod *v1.Pod, err error) { return nil