Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove redundant definition of the defaultProvider in the scheduler #85695

Merged
merged 1 commit into from Nov 28, 2019
Merged

remove redundant definition of the defaultProvider in the scheduler #85695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions pkg/scheduler/algorithm_factory.go
View file
Open in desktop
Expand Up @@ -81,11 +81,6 @@ var (
predicateMetadataProducerFactory PredicateMetadataProducerFactory
)

const (
// DefaultProvider defines the default algorithm provider name.
DefaultProvider = "DefaultProvider"
)

// AlgorithmProviderConfig is used to store the configuration of algorithm providers.
type AlgorithmProviderConfig struct {
FitPredicateKeys sets.String
Expand Down
5 changes: 4 additions & 1 deletion pkg/scheduler/algorithmprovider/BUILD
View file
Open in desktop
Expand Up @@ -17,7 +17,10 @@ go_test(
name = "go_default_test",
srcs = ["plugins_test.go"],
embed = [":go_default_library"],
deps = ["//pkg/scheduler:go_default_library"],
deps = [
"//pkg/scheduler:go_default_library",
"//pkg/scheduler/apis/config:go_default_library",
],
)

filegroup(
Expand Down
1 change: 1 addition & 0 deletions pkg/scheduler/algorithmprovider/defaults/BUILD
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@ go_library(
"//pkg/scheduler/algorithm:go_default_library",
"//pkg/scheduler/algorithm/predicates:go_default_library",
"//pkg/scheduler/algorithm/priorities:go_default_library",
"//pkg/scheduler/apis/config:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
Expand Down
3 changes: 2 additions & 1 deletion pkg/scheduler/algorithmprovider/defaults/defaults.go
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@ import (
"k8s.io/kubernetes/pkg/scheduler"
"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates"
"k8s.io/kubernetes/pkg/scheduler/algorithm/priorities"
schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
)

const (
Expand Down Expand Up @@ -93,7 +94,7 @@ func ApplyFeatureGates() (restore func()) {
func registerAlgorithmProvider(predSet, priSet sets.String) {
// Registers algorithm providers. By default we use 'DefaultProvider', but user can specify one to be used
// by specifying flag.
scheduler.RegisterAlgorithmProvider(scheduler.DefaultProvider, predSet, priSet)
scheduler.RegisterAlgorithmProvider(schedulerapi.SchedulerDefaultProviderName, predSet, priSet)
// Cluster autoscaler friendly scheduling algorithm.
scheduler.RegisterAlgorithmProvider(ClusterAutoscalerProvider, predSet,
copyAndReplace(priSet, priorities.LeastRequestedPriority, priorities.MostRequestedPriority))
Expand Down
5 changes: 3 additions & 2 deletions pkg/scheduler/algorithmprovider/plugins_test.go
View file
Open in desktop
Expand Up @@ -21,16 +21,17 @@ import (
"testing"

"k8s.io/kubernetes/pkg/scheduler"
schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
)

var (
algorithmProviderNames = []string{
scheduler.DefaultProvider,
schedulerapi.SchedulerDefaultProviderName,
}
)

func TestDefaultConfigExists(t *testing.T) {
p, err := scheduler.GetAlgorithmProvider(scheduler.DefaultProvider)
p, err := scheduler.GetAlgorithmProvider(schedulerapi.SchedulerDefaultProviderName)
if err != nil {
t.Errorf("error retrieving default provider: %v", err)
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/scheduler/factory.go
View file
Open in desktop
Expand Up @@ -119,7 +119,7 @@ func (c *Configurator) GetHardPodAffinitySymmetricWeight() int32 {

// Create creates a scheduler with the default algorithm provider.
func (c *Configurator) Create() (*Scheduler, error) {
return c.CreateFromProvider(DefaultProvider)
return c.CreateFromProvider(schedulerapi.SchedulerDefaultProviderName)
}

// CreateFromProvider creates a scheduler from the name of a registered algorithm provider.
Expand All @@ -143,8 +143,8 @@ func (c *Configurator) CreateFromConfig(policy schedulerapi.Policy) (*Scheduler,

predicateKeys := sets.NewString()
if policy.Predicates == nil {
klog.V(2).Infof("Using predicates from algorithm provider '%v'", DefaultProvider)
provider, err := GetAlgorithmProvider(DefaultProvider)
klog.V(2).Infof("Using predicates from algorithm provider '%v'", schedulerapi.SchedulerDefaultProviderName)
provider, err := GetAlgorithmProvider(schedulerapi.SchedulerDefaultProviderName)
if err != nil {
return nil, err
}
Expand All @@ -158,8 +158,8 @@ func (c *Configurator) CreateFromConfig(policy schedulerapi.Policy) (*Scheduler,

priorityKeys := sets.NewString()
if policy.Priorities == nil {
klog.V(2).Infof("Using priorities from algorithm provider '%v'", DefaultProvider)
provider, err := GetAlgorithmProvider(DefaultProvider)
klog.V(2).Infof("Using priorities from algorithm provider '%v'", schedulerapi.SchedulerDefaultProviderName)
provider, err := GetAlgorithmProvider(schedulerapi.SchedulerDefaultProviderName)
if err != nil {
return nil, err
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/scheduler/factory_test.go
View file
Open in desktop
Expand Up @@ -240,7 +240,7 @@ func TestCreateFromConfigWithUnspecifiedPredicatesOrPriorities(t *testing.T) {
RegisterFitPredicate("PredicateOne", PredicateFunc)
RegisterPriorityMapReduceFunction("PriorityOne", PriorityFunc, nil, 1)

RegisterAlgorithmProvider(DefaultProvider, sets.NewString("PredicateOne"), sets.NewString("PriorityOne"))
RegisterAlgorithmProvider(schedulerapi.SchedulerDefaultProviderName, sets.NewString("PredicateOne"), sets.NewString("PriorityOne"))

configData := []byte(`{
"kind" : "Policy",
Expand All @@ -256,10 +256,10 @@ func TestCreateFromConfigWithUnspecifiedPredicatesOrPriorities(t *testing.T) {
t.Fatalf("Failed to create scheduler from configuration: %v", err)
}
if _, found := c.Algorithm.Predicates()["PredicateOne"]; !found {
t.Errorf("Expected predicate PredicateOne from %q", DefaultProvider)
t.Errorf("Expected predicate PredicateOne from %q", schedulerapi.SchedulerDefaultProviderName)
}
if len(c.Algorithm.Prioritizers()) != 1 || c.Algorithm.Prioritizers()[0].Name != "PriorityOne" {
t.Errorf("Expected priority PriorityOne from %q", DefaultProvider)
t.Errorf("Expected priority PriorityOne from %q", schedulerapi.SchedulerDefaultProviderName)
}
}

Expand All @@ -275,7 +275,7 @@ func TestCreateFromConfigWithEmptyPredicatesOrPriorities(t *testing.T) {
RegisterFitPredicate("PredicateOne", PredicateFunc)
RegisterPriorityMapReduceFunction("PriorityOne", PriorityFunc, nil, 1)

RegisterAlgorithmProvider(DefaultProvider, sets.NewString("PredicateOne"), sets.NewString("PriorityOne"))
RegisterAlgorithmProvider(schedulerapi.SchedulerDefaultProviderName, sets.NewString("PredicateOne"), sets.NewString("PriorityOne"))

configData := []byte(`{
"kind" : "Policy",
Expand Down