github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Reorder default Filter plugins to have UnschedulableAndUnresolvable first

Browse Source
This commit is contained in:
He Jie Xu 2020-10-14 02:16:16 +00:00
parent 9891ac4d4d
commit 6e55b88725
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/kube-scheduler/app/server_test.go
View File

@ -164,12 +164,12 @@ profiles:
}, },
"FilterPlugin": { "FilterPlugin": {
{Name: "NodeUnschedulable"}, {Name: "NodeUnschedulable"},
{Name: "NodeResourcesFit"},
{Name: "NodeName"}, {Name: "NodeName"},
{Name: "NodePorts"},
{Name: "NodeAffinity"},
{Name: "VolumeRestrictions"},
{Name: "TaintToleration"}, {Name: "TaintToleration"},
{Name: "NodeAffinity"},
{Name: "NodePorts"},
{Name: "NodeResourcesFit"},
{Name: "VolumeRestrictions"},
{Name: "EBSLimits"}, {Name: "EBSLimits"},
{Name: "GCEPDLimits"}, {Name: "GCEPDLimits"},
{Name: "NodeVolumeLimits"}, {Name: "NodeVolumeLimits"},
@ -294,12 +294,12 @@ profiles:
}, },
"FilterPlugin": { "FilterPlugin": {
{Name: "NodeUnschedulable"}, {Name: "NodeUnschedulable"},
{Name: "NodeResourcesFit"},
{Name: "NodeName"}, {Name: "NodeName"},
{Name: "NodePorts"},
{Name: "NodeAffinity"},
{Name: "VolumeRestrictions"},
{Name: "TaintToleration"}, {Name: "TaintToleration"},
{Name: "NodeAffinity"},
{Name: "NodePorts"},
{Name: "NodeResourcesFit"},
{Name: "VolumeRestrictions"},
{Name: "EBSLimits"}, {Name: "EBSLimits"},
{Name: "GCEPDLimits"}, {Name: "GCEPDLimits"},
{Name: "NodeVolumeLimits"}, {Name: "NodeVolumeLimits"},

8
pkg/scheduler/algorithmprovider/registry.go
View File

@ -87,12 +87,12 @@ func getDefaultConfig() *schedulerapi.Plugins {
Filter: &schedulerapi.PluginSet{ Filter: &schedulerapi.PluginSet{
Enabled: []schedulerapi.Plugin{ Enabled: []schedulerapi.Plugin{
{Name: nodeunschedulable.Name}, {Name: nodeunschedulable.Name},
{Name: noderesources.FitName},
{Name: nodename.Name}, {Name: nodename.Name},
{Name: nodeports.Name},
{Name: nodeaffinity.Name},
{Name: volumerestrictions.Name},
{Name: tainttoleration.Name}, {Name: tainttoleration.Name},
{Name: nodeaffinity.Name},
{Name: nodeports.Name},
{Name: noderesources.FitName},
{Name: volumerestrictions.Name},
{Name: nodevolumelimits.EBSName}, {Name: nodevolumelimits.EBSName},
{Name: nodevolumelimits.GCEPDName}, {Name: nodevolumelimits.GCEPDName},
{Name: nodevolumelimits.CSIName}, {Name: nodevolumelimits.CSIName},

24
pkg/scheduler/algorithmprovider/registry_test.go
View File

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

24
pkg/scheduler/apis/config/testing/compatibility_test.go
View File

@ -1386,12 +1386,12 @@ func TestAlgorithmProviderCompatibility(t *testing.T) {
}, },
"FilterPlugin": { "FilterPlugin": {
{Name: "NodeUnschedulable"}, {Name: "NodeUnschedulable"},
{Name: "NodeResourcesFit"},
{Name: "NodeName"}, {Name: "NodeName"},
{Name: "NodePorts"},
{Name: "NodeAffinity"},
{Name: "VolumeRestrictions"},
{Name: "TaintToleration"}, {Name: "TaintToleration"},
{Name: "NodeAffinity"},
{Name: "NodePorts"},
{Name: "NodeResourcesFit"},
{Name: "VolumeRestrictions"},
{Name: "EBSLimits"}, {Name: "EBSLimits"},
{Name: "GCEPDLimits"}, {Name: "GCEPDLimits"},
{Name: "NodeVolumeLimits"}, {Name: "NodeVolumeLimits"},
@ -1456,12 +1456,12 @@ func TestAlgorithmProviderCompatibility(t *testing.T) {
}, },
"FilterPlugin": { "FilterPlugin": {
{Name: "NodeUnschedulable"}, {Name: "NodeUnschedulable"},
{Name: "NodeResourcesFit"},
{Name: "NodeName"}, {Name: "NodeName"},
{Name: "NodePorts"},
{Name: "NodeAffinity"},
{Name: "VolumeRestrictions"},
{Name: "TaintToleration"}, {Name: "TaintToleration"},
{Name: "NodeAffinity"},
{Name: "NodePorts"},
{Name: "NodeResourcesFit"},
{Name: "VolumeRestrictions"},
{Name: "EBSLimits"}, {Name: "EBSLimits"},
{Name: "GCEPDLimits"}, {Name: "GCEPDLimits"},
{Name: "NodeVolumeLimits"}, {Name: "NodeVolumeLimits"},
@ -1545,12 +1545,12 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
}, },
"FilterPlugin": { "FilterPlugin": {
{Name: "NodeUnschedulable"}, {Name: "NodeUnschedulable"},
{Name: "NodeResourcesFit"},
{Name: "NodeName"}, {Name: "NodeName"},
{Name: "NodePorts"},
{Name: "NodeAffinity"},
{Name: "VolumeRestrictions"},
{Name: "TaintToleration"}, {Name: "TaintToleration"},
{Name: "NodeAffinity"},
{Name: "NodePorts"},
{Name: "NodeResourcesFit"},
{Name: "VolumeRestrictions"},
{Name: "EBSLimits"}, {Name: "EBSLimits"},
{Name: "GCEPDLimits"}, {Name: "GCEPDLimits"},
{Name: "NodeVolumeLimits"}, {Name: "NodeVolumeLimits"},