Move default binding to a plugin

Signed-off-by: Aldo Culquicondor <acondor@google.com>

pkg/scheduler/testing/framework_helpers.go

@@ -21,6 +21,17 @@ import (
 	framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
 )
 
+// NewFramework creates a Framework from the register functions and options.
+func NewFramework(fns []RegisterPluginFunc, opts ...framework.Option) (framework.Framework, error) {
+	registry := framework.Registry{}
+	plugins := &schedulerapi.Plugins{}
+	var pluginConfigs []schedulerapi.PluginConfig
+	for _, f := range fns {
+		f(&registry, plugins, pluginConfigs)
+	}
+	return framework.NewFramework(registry, plugins, pluginConfigs, opts...)
+}
+
 // RegisterPluginFunc is a function signature used in method RegisterFilterPlugin()
 // to register a Filter Plugin to a given registry.
 type RegisterPluginFunc func(reg *framework.Registry, plugins *schedulerapi.Plugins, pluginConfigs []schedulerapi.PluginConfig)
@@ -45,16 +56,21 @@ func RegisterPostFilterPlugin(pluginName string, pluginNewFunc framework.PluginF
 	return RegisterPluginAsExtensions(pluginName, 1, pluginNewFunc, "PostFilter")
 }
 
+// RegisterBindPlugin returns a function to register a Bind Plugin to a given registry.
+func RegisterBindPlugin(pluginName string, pluginNewFunc framework.PluginFactory) RegisterPluginFunc {
+	return RegisterPluginAsExtensions(pluginName, 1, pluginNewFunc, "Bind")
+}
+
 // RegisterPluginAsExtensions returns a function to register a Plugin as given extensionPoints to a given registry.
 func RegisterPluginAsExtensions(pluginName string, weight int32, pluginNewFunc framework.PluginFactory, extensions ...string) RegisterPluginFunc {
 	return func(reg *framework.Registry, plugins *schedulerapi.Plugins, pluginConfigs []schedulerapi.PluginConfig) {
 		reg.Register(pluginName, pluginNewFunc)
 		for _, extension := range extensions {
-			pluginSet := getPluginSetByExtension(plugins, extension)
-			if pluginSet == nil {
+			ps := getPluginSetByExtension(plugins, extension)
+			if ps == nil {
 				continue
 			}
-			pluginSet.Enabled = append(pluginSet.Enabled, schedulerapi.Plugin{Name: pluginName, Weight: weight})
+			ps.Enabled = append(ps.Enabled, schedulerapi.Plugin{Name: pluginName, Weight: weight})
 		}
 		//lint:ignore SA4006 this value of pluginConfigs is never used.
 		//lint:ignore SA4010 this result of append is never used.
@@ -65,22 +81,29 @@ func RegisterPluginAsExtensions(pluginName string, weight int32, pluginNewFunc f
 func getPluginSetByExtension(plugins *schedulerapi.Plugins, extension string) *schedulerapi.PluginSet {
 	switch extension {
 	case "QueueSort":
-		return plugins.QueueSort
+		return initializeIfNeeded(&plugins.QueueSort)
 	case "Filter":
-		return plugins.Filter
+		return initializeIfNeeded(&plugins.Filter)
 	case "PreFilter":
-		return plugins.PreFilter
+		return initializeIfNeeded(&plugins.PreFilter)
 	case "PostFilter":
-		return plugins.PostFilter
+		return initializeIfNeeded(&plugins.PostFilter)
 	case "Score":
-		return plugins.Score
+		return initializeIfNeeded(&plugins.Score)
 	case "Bind":
-		return plugins.Bind
+		return initializeIfNeeded(&plugins.Bind)
 	case "Reserve":
-		return plugins.Reserve
+		return initializeIfNeeded(&plugins.Reserve)
 	case "Permit":
-		return plugins.Permit
+		return initializeIfNeeded(&plugins.Permit)
 	default:
 		return nil
 	}
 }
+
+func initializeIfNeeded(s **schedulerapi.PluginSet) *schedulerapi.PluginSet {
+	if *s == nil {
+		*s = &schedulerapi.PluginSet{}
+	}
+	return *s
+}