Merge pull request #95539 from soulxu/issue_95442

Reorder default Filter plugins to have UnschedulableAndUnresolvable f…
kubernetes · Oct 14, 2020 · b2de4a6 · b2de4a6
2 parents 6d01c5a + 6e55b88
commit b2de4a6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/cmd/kube-scheduler/app/server_test.go b/cmd/kube-scheduler/app/server_test.go
@@ -164,12 +164,12 @@ profiles:
 		},
 		"FilterPlugin": {
 			{Name: "NodeUnschedulable"},
-			{Name: "NodeResourcesFit"},
 			{Name: "NodeName"},
-			{Name: "NodePorts"},
+			{Name: "TaintToleration"},
 			{Name: "NodeAffinity"},
+			{Name: "NodePorts"},
+			{Name: "NodeResourcesFit"},
 			{Name: "VolumeRestrictions"},
-			{Name: "TaintToleration"},
 			{Name: "EBSLimits"},
 			{Name: "GCEPDLimits"},
 			{Name: "NodeVolumeLimits"},
@@ -294,12 +294,12 @@ profiles:
 					},
 					"FilterPlugin": {
 						{Name: "NodeUnschedulable"},
-						{Name: "NodeResourcesFit"},
 						{Name: "NodeName"},
-						{Name: "NodePorts"},
+						{Name: "TaintToleration"},
 						{Name: "NodeAffinity"},
+						{Name: "NodePorts"},
+						{Name: "NodeResourcesFit"},
 						{Name: "VolumeRestrictions"},
-						{Name: "TaintToleration"},
 						{Name: "EBSLimits"},
 						{Name: "GCEPDLimits"},
 						{Name: "NodeVolumeLimits"},

diff --git a/pkg/scheduler/algorithmprovider/registry.go b/pkg/scheduler/algorithmprovider/registry.go
@@ -87,12 +87,12 @@ func getDefaultConfig() *schedulerapi.Plugins {
 		Filter: &schedulerapi.PluginSet{
 			Enabled: []schedulerapi.Plugin{
 				{Name: nodeunschedulable.Name},
-				{Name: noderesources.FitName},
 				{Name: nodename.Name},
-				{Name: nodeports.Name},
+				{Name: tainttoleration.Name},
 				{Name: nodeaffinity.Name},
+				{Name: nodeports.Name},
+				{Name: noderesources.FitName},
 				{Name: volumerestrictions.Name},
-				{Name: tainttoleration.Name},
 				{Name: nodevolumelimits.EBSName},
 				{Name: nodevolumelimits.GCEPDName},
 				{Name: nodevolumelimits.CSIName},

diff --git a/pkg/scheduler/algorithmprovider/registry_test.go b/pkg/scheduler/algorithmprovider/registry_test.go
@@ -65,12 +65,12 @@ func TestClusterAutoscalerProvider(t *testing.T) {
 		Filter: &schedulerapi.PluginSet{
 			Enabled: []schedulerapi.Plugin{
 				{Name: nodeunschedulable.Name},
-				{Name: noderesources.FitName},
 				{Name: nodename.Name},
-				{Name: nodeports.Name},
+				{Name: tainttoleration.Name},
 				{Name: nodeaffinity.Name},
+				{Name: nodeports.Name},
+				{Name: noderesources.FitName},
 				{Name: volumerestrictions.Name},
-				{Name: tainttoleration.Name},
 				{Name: nodevolumelimits.EBSName},
 				{Name: nodevolumelimits.GCEPDName},
 				{Name: nodevolumelimits.CSIName},
@@ -157,12 +157,12 @@ func TestApplyFeatureGates(t *testing.T) {
 				Filter: &schedulerapi.PluginSet{
 					Enabled: []schedulerapi.Plugin{
 						{Name: nodeunschedulable.Name},
-						{Name: noderesources.FitName},
 						{Name: nodename.Name},
-						{Name: nodeports.Name},
+						{Name: tainttoleration.Name},
 						{Name: nodeaffinity.Name},
+						{Name: nodeports.Name},
+						{Name: noderesources.FitName},
 						{Name: volumerestrictions.Name},
-						{Name: tainttoleration.Name},
 						{Name: nodevolumelimits.EBSName},
 						{Name: nodevolumelimits.GCEPDName},
 						{Name: nodevolumelimits.CSIName},
@@ -237,12 +237,12 @@ func TestApplyFeatureGates(t *testing.T) {
 				Filter: &schedulerapi.PluginSet{
 					Enabled: []schedulerapi.Plugin{
 						{Name: nodeunschedulable.Name},
-						{Name: noderesources.FitName},
 						{Name: nodename.Name},
-						{Name: nodeports.Name},
+						{Name: tainttoleration.Name},
 						{Name: nodeaffinity.Name},
+						{Name: nodeports.Name},
+						{Name: noderesources.FitName},
 						{Name: volumerestrictions.Name},
-						{Name: tainttoleration.Name},
 						{Name: nodevolumelimits.EBSName},
 						{Name: nodevolumelimits.GCEPDName},
 						{Name: nodevolumelimits.CSIName},

diff --git a/pkg/scheduler/apis/config/testing/compatibility_test.go b/pkg/scheduler/apis/config/testing/compatibility_test.go
@@ -1386,12 +1386,12 @@ func TestAlgorithmProviderCompatibility(t *testing.T) {
 		},
 		"FilterPlugin": {
 			{Name: "NodeUnschedulable"},
-			{Name: "NodeResourcesFit"},
 			{Name: "NodeName"},
-			{Name: "NodePorts"},
+			{Name: "TaintToleration"},
 			{Name: "NodeAffinity"},
+			{Name: "NodePorts"},
+			{Name: "NodeResourcesFit"},
 			{Name: "VolumeRestrictions"},
-			{Name: "TaintToleration"},
 			{Name: "EBSLimits"},
 			{Name: "GCEPDLimits"},
 			{Name: "NodeVolumeLimits"},
@@ -1456,12 +1456,12 @@ func TestAlgorithmProviderCompatibility(t *testing.T) {
 				},
 				"FilterPlugin": {
 					{Name: "NodeUnschedulable"},
-					{Name: "NodeResourcesFit"},
 					{Name: "NodeName"},
-					{Name: "NodePorts"},
+					{Name: "TaintToleration"},
 					{Name: "NodeAffinity"},
+					{Name: "NodePorts"},
+					{Name: "NodeResourcesFit"},
 					{Name: "VolumeRestrictions"},
-					{Name: "TaintToleration"},
 					{Name: "EBSLimits"},
 					{Name: "GCEPDLimits"},
 					{Name: "NodeVolumeLimits"},
@@ -1545,12 +1545,12 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
 		},
 		"FilterPlugin": {
 			{Name: "NodeUnschedulable"},
-			{Name: "NodeResourcesFit"},
 			{Name: "NodeName"},
-			{Name: "NodePorts"},
+			{Name: "TaintToleration"},
 			{Name: "NodeAffinity"},
+			{Name: "NodePorts"},
+			{Name: "NodeResourcesFit"},
 			{Name: "VolumeRestrictions"},
-			{Name: "TaintToleration"},
 			{Name: "EBSLimits"},
 			{Name: "GCEPDLimits"},
 			{Name: "NodeVolumeLimits"},