From 6e55b8872594f6b8ae4e5f81e51744bd7a19ae04 Mon Sep 17 00:00:00 2001 From: He Jie Xu Date: Wed, 14 Oct 2020 02:16:16 +0000 Subject: [PATCH] Reorder default Filter plugins to have UnschedulableAndUnresolvable first --- cmd/kube-scheduler/app/server_test.go | 16 ++++++------- pkg/scheduler/algorithmprovider/registry.go | 8 +++---- .../algorithmprovider/registry_test.go | 24 +++++++++---------- .../apis/config/testing/compatibility_test.go | 24 +++++++++---------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/cmd/kube-scheduler/app/server_test.go b/cmd/kube-scheduler/app/server_test.go index 862e8cbd224..f4296805499 100644 --- 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: "NodeAffinity"}, - {Name: "VolumeRestrictions"}, {Name: "TaintToleration"}, + {Name: "NodeAffinity"}, + {Name: "NodePorts"}, + {Name: "NodeResourcesFit"}, + {Name: "VolumeRestrictions"}, {Name: "EBSLimits"}, {Name: "GCEPDLimits"}, {Name: "NodeVolumeLimits"}, @@ -294,12 +294,12 @@ profiles: }, "FilterPlugin": { {Name: "NodeUnschedulable"}, - {Name: "NodeResourcesFit"}, {Name: "NodeName"}, - {Name: "NodePorts"}, - {Name: "NodeAffinity"}, - {Name: "VolumeRestrictions"}, {Name: "TaintToleration"}, + {Name: "NodeAffinity"}, + {Name: "NodePorts"}, + {Name: "NodeResourcesFit"}, + {Name: "VolumeRestrictions"}, {Name: "EBSLimits"}, {Name: "GCEPDLimits"}, {Name: "NodeVolumeLimits"}, diff --git a/pkg/scheduler/algorithmprovider/registry.go b/pkg/scheduler/algorithmprovider/registry.go index 52fdff8768e..0ad2e778834 100644 --- 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: nodeaffinity.Name}, - {Name: volumerestrictions.Name}, {Name: tainttoleration.Name}, + {Name: nodeaffinity.Name}, + {Name: nodeports.Name}, + {Name: noderesources.FitName}, + {Name: volumerestrictions.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 index 23d492cb8e0..52039e7f086 100644 --- 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: nodeaffinity.Name}, - {Name: volumerestrictions.Name}, {Name: tainttoleration.Name}, + {Name: nodeaffinity.Name}, + {Name: nodeports.Name}, + {Name: noderesources.FitName}, + {Name: volumerestrictions.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: nodeaffinity.Name}, - {Name: volumerestrictions.Name}, {Name: tainttoleration.Name}, + {Name: nodeaffinity.Name}, + {Name: nodeports.Name}, + {Name: noderesources.FitName}, + {Name: volumerestrictions.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: nodeaffinity.Name}, - {Name: volumerestrictions.Name}, {Name: tainttoleration.Name}, + {Name: nodeaffinity.Name}, + {Name: nodeports.Name}, + {Name: noderesources.FitName}, + {Name: volumerestrictions.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 index 6e57ae08384..87992d152b4 100644 --- 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: "NodeAffinity"}, - {Name: "VolumeRestrictions"}, {Name: "TaintToleration"}, + {Name: "NodeAffinity"}, + {Name: "NodePorts"}, + {Name: "NodeResourcesFit"}, + {Name: "VolumeRestrictions"}, {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: "NodeAffinity"}, - {Name: "VolumeRestrictions"}, {Name: "TaintToleration"}, + {Name: "NodeAffinity"}, + {Name: "NodePorts"}, + {Name: "NodeResourcesFit"}, + {Name: "VolumeRestrictions"}, {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: "NodeAffinity"}, - {Name: "VolumeRestrictions"}, {Name: "TaintToleration"}, + {Name: "NodeAffinity"}, + {Name: "NodePorts"}, + {Name: "NodeResourcesFit"}, + {Name: "VolumeRestrictions"}, {Name: "EBSLimits"}, {Name: "GCEPDLimits"}, {Name: "NodeVolumeLimits"},