Merge pull request kubernetes#6188 from abhgupta/abhgupta-dev

Minor fixes for scheduler priority configuration
nikhiljindal · Mar 30, 2015 · 10b4fe6 · 10b4fe6
2 parents 795cd38 + 490dd1b
commit 10b4fe6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go b/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go
@@ -25,6 +25,10 @@ import (
 
 func init() {
 	factory.RegisterAlgorithmProvider(factory.DefaultProvider, defaultPredicates(), defaultPriorities())
+	// EqualPriority is a prioritizer function that gives an equal weight of one to all minions
+	// Register the priority function so that its available
+	// but do not include it as part of the default priorities
+	factory.RegisterPriorityFunction("EqualPriority", algorithm.EqualPriority, 1)
 }
 
 func defaultPredicates() util.StringSet {
@@ -66,7 +70,5 @@ func defaultPriorities() util.StringSet {
 				Weight: 1,
 			},
 		),
-		// EqualPriority is a prioritizer function that gives an equal weight of one to all minions
-		factory.RegisterPriorityFunction("EqualPriority", algorithm.EqualPriority, 0),
 	)
 }
diff --git a/plugin/pkg/scheduler/factory/plugins.go b/plugin/pkg/scheduler/factory/plugins.go
@@ -137,7 +137,7 @@ func RegisterPriorityFunction(name string, function algorithm.PriorityFunction,
 		Function: func(PluginFactoryArgs) algorithm.PriorityFunction {
 			return function
 		},
-		Weight: 1,
+		Weight: weight,
 	})
 }