Revert "Add Bind extension point of the scheduling framework"

pkg/scheduler/framework/v1alpha1/framework.go

@@ -39,7 +39,6 @@ type framework struct {
 	prefilterPlugins []PrefilterPlugin
 	reservePlugins   []ReservePlugin
 	prebindPlugins   []PrebindPlugin
-	bindPlugins      []BindPlugin
 	postbindPlugins  []PostbindPlugin
 	unreservePlugins []UnreservePlugin
 	permitPlugins    []PermitPlugin
@@ -129,20 +128,6 @@ func NewFramework(r Registry, plugins *config.Plugins, args []config.PluginConfi
 		}
 	}
 
-	if plugins.Bind != nil {
-		for _, pb := range plugins.Bind.Enabled {
-			if pg, ok := f.plugins[pb.Name]; ok {
-				p, ok := pg.(BindPlugin)
-				if !ok {
-					return nil, fmt.Errorf("plugin %v does not extend bind plugin", pb.Name)
-				}
-				f.bindPlugins = append(f.bindPlugins, p)
-			} else {
-				return nil, fmt.Errorf("bind plugin %v does not exist", pb.Name)
-			}
-		}
-	}
-
 	if plugins.PostBind != nil {
 		for _, pb := range plugins.PostBind.Enabled {
 			if pg, ok := f.plugins[pb.Name]; ok {
@@ -258,27 +243,6 @@ func (f *framework) RunPrebindPlugins(
 	return nil
 }
 
-// RunBindPlugins runs the set of configured bind plugins until one returns a non `Skip` status.
-func (f *framework) RunBindPlugins(pc *PluginContext, pod *v1.Pod, nodeName string) *Status {
-	if len(f.bindPlugins) == 0 {
-		return NewStatus(Skip, "")
-	}
-	var status *Status
-	for _, bp := range f.bindPlugins {
-		status = bp.Bind(pc, pod, nodeName)
-		if status != nil && status.Code() == Skip {
-			continue
-		}
-		if !status.IsSuccess() {
-			msg := fmt.Sprintf("bind plugin %v failed to bind pod %v/%v: %v", bp.Name(), pod.Namespace, pod.Name, status.Message())
-			klog.Error(msg)
-			return NewStatus(Error, msg)
-		}
-		return status
-	}
-	return status
-}
-
 // RunPostbindPlugins runs the set of configured postbind plugins.
 func (f *framework) RunPostbindPlugins(
 	pc *PluginContext, pod *v1.Pod, nodeName string) {

pkg/scheduler/framework/v1alpha1/interface.go

@@ -42,8 +42,6 @@ const (
 	Unschedulable
 	// Wait is used when a permit plugin finds a pod scheduling should wait.
 	Wait
-	// Skip is used when a bind plugin chooses to skip binding.
-	Skip
 )
 
 // Status indicates the result of running a plugin. It consists of a code and a
@@ -194,17 +192,6 @@ type PermitPlugin interface {
 	Permit(pc *PluginContext, p *v1.Pod, nodeName string) (*Status, time.Duration)
 }
 
-// BindPlugin is an interface that must be implemented by "bind" plugins. Bind
-// plugins are used to bind a pod to a Node.
-type BindPlugin interface {
-	Plugin
-	// Bind plugins will not be called until all pre-bind plugins have completed. Each
-	// bind plugin is called in the configured order. A bind plugin may choose whether
-	// or not to handle the given Pod. If a bind plugin chooses to handle a Pod, the
-	// remaining bind plugins are skipped.
-	Bind(pc *PluginContext, p *v1.Pod, nodeName string) *Status
-}
-
 // Framework manages the set of plugins in use by the scheduling framework.
 // Configured plugins are called at specified points in a scheduling context.
 type Framework interface {
@@ -244,13 +231,6 @@ type Framework interface {
 	// Note that if multiple plugins asked to wait, then we wait for the minimum
 	// timeout duration.
 	RunPermitPlugins(pc *PluginContext, pod *v1.Pod, nodeName string) *Status
-
-	// RunBindPlugins runs the set of configured bind plugins. A bind plugin may choose
-	// whether or not to handle the given Pod. If a bind plugin chooses to skip the
-	// binding, it should return code=4("skip") status. Otherwise, it should return "Error"
-	// or "Success". If none of the plugins handled binding, RunBindPlugins returns
-	// code=4("skip") status.
-	RunBindPlugins(pc *PluginContext, pod *v1.Pod, nodeName string) *Status
 }
 
 // FrameworkHandle provides data and some tools that plugins can use. It is

pkg/scheduler/internal/queue/scheduling_queue_test.go

@@ -175,10 +175,6 @@ func (*fakeFramework) RunPrebindPlugins(pc *framework.PluginContext, pod *v1.Pod
 	return nil
 }
 
-func (*fakeFramework) RunBindPlugins(pc *framework.PluginContext, pod *v1.Pod, nodeName string) *framework.Status {
-	return nil
-}
-
 func (*fakeFramework) RunPostbindPlugins(pc *framework.PluginContext, pod *v1.Pod, nodeName string) {}
 
 func (*fakeFramework) RunReservePlugins(pc *framework.PluginContext, pod *v1.Pod, nodeName string) *framework.Status {

pkg/scheduler/scheduler.go

@@ -412,25 +412,11 @@ func (sched *Scheduler) assume(assumed *v1.Pod, host string) error {
 
 // bind binds a pod to a given node defined in a binding object.  We expect this to run asynchronously, so we
 // handle binding metrics internally.
-func (sched *Scheduler) bind(assumed *v1.Pod, targetNode string, pluginContext *framework.PluginContext) error {
+func (sched *Scheduler) bind(assumed *v1.Pod, b *v1.Binding) error {
 	bindingStart := time.Now()
-	bindStatus := sched.config.Framework.RunBindPlugins(pluginContext, assumed, targetNode)
-	var err error
-	if bindStatus != nil && bindStatus.Code() == framework.Skip {
-		// All bind plugins chooses to skip binding of this pod, call original binding func.
-
-		// If binding succeeded then PodScheduled condition will be updated in apiserver so that
-		// it's atomic with setting host.
-		err = sched.config.GetBinder(assumed).Bind(&v1.Binding{
-			ObjectMeta: metav1.ObjectMeta{Namespace: assumed.Namespace, Name: assumed.Name, UID: assumed.UID},
-			Target: v1.ObjectReference{
-				Kind: "Node",
-				Name: targetNode,
-			},
-		})
-	} else if !bindStatus.IsSuccess() {
-		err = fmt.Errorf("scheduler RunBindPlugins failed for pod %v/%v: code %d, err %v", assumed.Namespace, assumed.Name, bindStatus.Code(), err)
-	}
+	// If binding succeeded then PodScheduled condition will be updated in apiserver so that
+	// it's atomic with setting host.
+	err := sched.config.GetBinder(assumed).Bind(b)
 	if finErr := sched.config.SchedulerCache.FinishBinding(assumed); finErr != nil {
 		klog.Errorf("scheduler cache FinishBinding failed: %v", finErr)
 	}
@@ -448,7 +434,7 @@ func (sched *Scheduler) bind(assumed *v1.Pod, targetNode string, pluginContext *
 	metrics.DeprecatedBindingLatency.Observe(metrics.SinceInMicroseconds(bindingStart))
 	metrics.SchedulingLatency.WithLabelValues(metrics.Binding).Observe(metrics.SinceInSeconds(bindingStart))
 	metrics.DeprecatedSchedulingLatency.WithLabelValues(metrics.Binding).Observe(metrics.SinceInSeconds(bindingStart))
-	sched.config.Recorder.Eventf(assumed, v1.EventTypeNormal, "Scheduled", "Successfully assigned %v/%v to %v", assumed.Namespace, assumed.Name, targetNode)
+	sched.config.Recorder.Eventf(assumed, v1.EventTypeNormal, "Scheduled", "Successfully assigned %v/%v to %v", assumed.Namespace, assumed.Name, b.Target.Name)
 	return nil
 }
 
@@ -589,7 +575,13 @@ func (sched *Scheduler) scheduleOne() {
 			return
 		}
 
-		err := sched.bind(assumedPod, scheduleResult.SuggestedHost, pluginContext)
+		err := sched.bind(assumedPod, &v1.Binding{
+			ObjectMeta: metav1.ObjectMeta{Namespace: assumedPod.Namespace, Name: assumedPod.Name, UID: assumedPod.UID},
+			Target: v1.ObjectReference{
+				Kind: "Node",
+				Name: scheduleResult.SuggestedHost,
+			},
+		})
 		metrics.E2eSchedulingLatency.Observe(metrics.SinceInSeconds(start))
 		metrics.DeprecatedE2eSchedulingLatency.Observe(metrics.SinceInMicroseconds(start))
 		if err != nil {