scheduler/volumebinding: move all volume binding logic into VolumeBinding plugin

Author: cofyc

cmd/kube-scheduler/app/server_test.go

@@ -191,7 +191,11 @@ profiles:
 			{Name: "TaintToleration", Weight: 1},
 			{Name: "PodTopologySpread", Weight: 1},
 		},
-		"BindPlugin": {{Name: "DefaultBinder"}},
+		"BindPlugin":      {{Name: "DefaultBinder"}},
+		"ReservePlugin":   {{Name: "VolumeBinding"}},
+		"UnreservePlugin": {{Name: "VolumeBinding"}},
+		"PreBindPlugin":   {{Name: "VolumeBinding"}},
+		"PostBindPlugin":  {{Name: "VolumeBinding"}},
 	}
 
 	testcases := []struct {
@@ -222,6 +226,10 @@ profiles:
 					"PreScorePlugin":  {{Name: "InterPodAffinity"}, {Name: "TaintToleration"}},
 					"QueueSortPlugin": {{Name: "PrioritySort"}},
 					"ScorePlugin":     {{Name: "InterPodAffinity", Weight: 1}, {Name: "TaintToleration", Weight: 1}},
+					"ReservePlugin":   {{Name: "VolumeBinding"}},
+					"UnreservePlugin": {{Name: "VolumeBinding"}},
+					"PreBindPlugin":   {{Name: "VolumeBinding"}},
+					"PostBindPlugin":  {{Name: "VolumeBinding"}},
 				},
 			},
 		},
@@ -236,6 +244,10 @@ profiles:
 				"profile-disable-all-filter-and-score-plugins": {
 					"BindPlugin":      {{Name: "DefaultBinder"}},
 					"QueueSortPlugin": {{Name: "PrioritySort"}},
+					"ReservePlugin":   {{Name: "VolumeBinding"}},
+					"UnreservePlugin": {{Name: "VolumeBinding"}},
+					"PreBindPlugin":   {{Name: "VolumeBinding"}},
+					"PostBindPlugin":  {{Name: "VolumeBinding"}},
 				},
 			},
 		},
@@ -310,7 +322,11 @@ profiles:
 						{Name: "TaintToleration", Weight: 1},
 						{Name: "PodTopologySpread", Weight: 1},
 					},
-					"BindPlugin": {{Name: "DefaultBinder"}},
+					"BindPlugin":      {{Name: "DefaultBinder"}},
+					"ReservePlugin":   {{Name: "VolumeBinding"}},
+					"UnreservePlugin": {{Name: "VolumeBinding"}},
+					"PreBindPlugin":   {{Name: "VolumeBinding"}},
+					"PostBindPlugin":  {{Name: "VolumeBinding"}},
 				},
 			},
 		},

pkg/scheduler/algorithmprovider/registry.go

@@ -125,11 +125,31 @@ func getDefaultConfig() *schedulerapi.Plugins {
 				{Name: tainttoleration.Name, Weight: 1},
 			},
 		},
+		Reserve: &schedulerapi.PluginSet{
+			Enabled: []schedulerapi.Plugin{
+				{Name: volumebinding.Name},
+			},
+		},
+		Unreserve: &schedulerapi.PluginSet{
+			Enabled: []schedulerapi.Plugin{
+				{Name: volumebinding.Name},
+			},
+		},
+		PreBind: &schedulerapi.PluginSet{
+			Enabled: []schedulerapi.Plugin{
+				{Name: volumebinding.Name},
+			},
+		},
 		Bind: &schedulerapi.PluginSet{
 			Enabled: []schedulerapi.Plugin{
 				{Name: defaultbinder.Name},
 			},
 		},
+		PostBind: &schedulerapi.PluginSet{
+			Enabled: []schedulerapi.Plugin{
+				{Name: volumebinding.Name},
+			},
+		},
 	}
 }
 

pkg/scheduler/algorithmprovider/registry_test.go

@@ -99,11 +99,31 @@ func TestClusterAutoscalerProvider(t *testing.T) {
 				{Name: podtopologyspread.Name, Weight: 1},
 			},
 		},
+		Reserve: &schedulerapi.PluginSet{
+			Enabled: []schedulerapi.Plugin{
+				{Name: volumebinding.Name},
+			},
+		},
+		Unreserve: &schedulerapi.PluginSet{
+			Enabled: []schedulerapi.Plugin{
+				{Name: volumebinding.Name},
+			},
+		},
+		PreBind: &schedulerapi.PluginSet{
+			Enabled: []schedulerapi.Plugin{
+				{Name: volumebinding.Name},
+			},
+		},
 		Bind: &schedulerapi.PluginSet{
 			Enabled: []schedulerapi.Plugin{
 				{Name: defaultbinder.Name},
 			},
 		},
+		PostBind: &schedulerapi.PluginSet{
+			Enabled: []schedulerapi.Plugin{
+				{Name: volumebinding.Name},
+			},
+		},
 	}
 
 	r := NewRegistry()
@@ -172,11 +192,31 @@ func TestApplyFeatureGates(t *testing.T) {
 						{Name: tainttoleration.Name, Weight: 1},
 					},
 				},
+				Reserve: &schedulerapi.PluginSet{
+					Enabled: []schedulerapi.Plugin{
+						{Name: volumebinding.Name},
+					},
+				},
+				Unreserve: &schedulerapi.PluginSet{
+					Enabled: []schedulerapi.Plugin{
+						{Name: volumebinding.Name},
+					},
+				},
+				PreBind: &schedulerapi.PluginSet{
+					Enabled: []schedulerapi.Plugin{
+						{Name: volumebinding.Name},
+					},
+				},
 				Bind: &schedulerapi.PluginSet{
 					Enabled: []schedulerapi.Plugin{
 						{Name: defaultbinder.Name},
 					},
 				},
+				PostBind: &schedulerapi.PluginSet{
+					Enabled: []schedulerapi.Plugin{
+						{Name: volumebinding.Name},
+					},
+				},
 			},
 		},
 		{
@@ -238,11 +278,31 @@ func TestApplyFeatureGates(t *testing.T) {
 						{Name: noderesources.ResourceLimitsName, Weight: 1},
 					},
 				},
+				Reserve: &schedulerapi.PluginSet{
+					Enabled: []schedulerapi.Plugin{
+						{Name: volumebinding.Name},
+					},
+				},
+				Unreserve: &schedulerapi.PluginSet{
+					Enabled: []schedulerapi.Plugin{
+						{Name: volumebinding.Name},
+					},
+				},
+				PreBind: &schedulerapi.PluginSet{
+					Enabled: []schedulerapi.Plugin{
+						{Name: volumebinding.Name},
+					},
+				},
 				Bind: &schedulerapi.PluginSet{
 					Enabled: []schedulerapi.Plugin{
 						{Name: defaultbinder.Name},
 					},
 				},
+				PostBind: &schedulerapi.PluginSet{
+					Enabled: []schedulerapi.Plugin{
+						{Name: volumebinding.Name},
+					},
+				},
 			},
 		},
 	}

pkg/scheduler/apis/config/register.go

@@ -45,6 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&PodTopologySpreadArgs{},
 		&RequestedToCapacityRatioArgs{},
 		&ServiceAffinityArgs{},
+		&VolumeBindingArgs{},
 	)
 	scheme.AddKnownTypes(schema.GroupVersion{Group: "", Version: runtime.APIVersionInternal}, &Policy{})
 	return nil