Skip to content

Commit b2de4a6

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#95539 from soulxu/issue_95442
Reorder default Filter plugins to have UnschedulableAndUnresolvable f…
2 parents 6d01c5a + 6e55b88 commit b2de4a6

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎cmd/kube-scheduler/app/server_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@ profiles:
164164
},
165165
"FilterPlugin": {
166166
{Name: "NodeUnschedulable"},
167-
{Name: "NodeResourcesFit"},
168167
{Name: "NodeName"},
169-
{Name: "NodePorts"},
168+
{Name: "TaintToleration"},
170169
{Name: "NodeAffinity"},
170+
{Name: "NodePorts"},
171+
{Name: "NodeResourcesFit"},
171172
{Name: "VolumeRestrictions"},
172-
{Name: "TaintToleration"},
173173
{Name: "EBSLimits"},
174174
{Name: "GCEPDLimits"},
175175
{Name: "NodeVolumeLimits"},
@@ -294,12 +294,12 @@ profiles:
294294
},
295295
"FilterPlugin": {
296296
{Name: "NodeUnschedulable"},
297-
{Name: "NodeResourcesFit"},
298297
{Name: "NodeName"},
299-
{Name: "NodePorts"},
298+
{Name: "TaintToleration"},
300299
{Name: "NodeAffinity"},
300+
{Name: "NodePorts"},
301+
{Name: "NodeResourcesFit"},
301302
{Name: "VolumeRestrictions"},
302-
{Name: "TaintToleration"},
303303
{Name: "EBSLimits"},
304304
{Name: "GCEPDLimits"},
305305
{Name: "NodeVolumeLimits"},

‎pkg/scheduler/algorithmprovider/registry.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ func getDefaultConfig() *schedulerapi.Plugins {
8787
Filter: &schedulerapi.PluginSet{
8888
Enabled: []schedulerapi.Plugin{
8989
{Name: nodeunschedulable.Name},
90-
{Name: noderesources.FitName},
9190
{Name: nodename.Name},
92-
{Name: nodeports.Name},
91+
{Name: tainttoleration.Name},
9392
{Name: nodeaffinity.Name},
93+
{Name: nodeports.Name},
94+
{Name: noderesources.FitName},
9495
{Name: volumerestrictions.Name},
95-
{Name: tainttoleration.Name},
9696
{Name: nodevolumelimits.EBSName},
9797
{Name: nodevolumelimits.GCEPDName},
9898
{Name: nodevolumelimits.CSIName},

‎pkg/scheduler/algorithmprovider/registry_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ func TestClusterAutoscalerProvider(t *testing.T) {
6565
Filter: &schedulerapi.PluginSet{
6666
Enabled: []schedulerapi.Plugin{
6767
{Name: nodeunschedulable.Name},
68-
{Name: noderesources.FitName},
6968
{Name: nodename.Name},
70-
{Name: nodeports.Name},
69+
{Name: tainttoleration.Name},
7170
{Name: nodeaffinity.Name},
71+
{Name: nodeports.Name},
72+
{Name: noderesources.FitName},
7273
{Name: volumerestrictions.Name},
73-
{Name: tainttoleration.Name},
7474
{Name: nodevolumelimits.EBSName},
7575
{Name: nodevolumelimits.GCEPDName},
7676
{Name: nodevolumelimits.CSIName},
@@ -157,12 +157,12 @@ func TestApplyFeatureGates(t *testing.T) {
157157
Filter: &schedulerapi.PluginSet{
158158
Enabled: []schedulerapi.Plugin{
159159
{Name: nodeunschedulable.Name},
160-
{Name: noderesources.FitName},
161160
{Name: nodename.Name},
162-
{Name: nodeports.Name},
161+
{Name: tainttoleration.Name},
163162
{Name: nodeaffinity.Name},
163+
{Name: nodeports.Name},
164+
{Name: noderesources.FitName},
164165
{Name: volumerestrictions.Name},
165-
{Name: tainttoleration.Name},
166166
{Name: nodevolumelimits.EBSName},
167167
{Name: nodevolumelimits.GCEPDName},
168168
{Name: nodevolumelimits.CSIName},
@@ -237,12 +237,12 @@ func TestApplyFeatureGates(t *testing.T) {
237237
Filter: &schedulerapi.PluginSet{
238238
Enabled: []schedulerapi.Plugin{
239239
{Name: nodeunschedulable.Name},
240-
{Name: noderesources.FitName},
241240
{Name: nodename.Name},
242-
{Name: nodeports.Name},
241+
{Name: tainttoleration.Name},
243242
{Name: nodeaffinity.Name},
243+
{Name: nodeports.Name},
244+
{Name: noderesources.FitName},
244245
{Name: volumerestrictions.Name},
245-
{Name: tainttoleration.Name},
246246
{Name: nodevolumelimits.EBSName},
247247
{Name: nodevolumelimits.GCEPDName},
248248
{Name: nodevolumelimits.CSIName},

‎pkg/scheduler/apis/config/testing/compatibility_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,12 +1386,12 @@ func TestAlgorithmProviderCompatibility(t *testing.T) {
13861386
},
13871387
"FilterPlugin": {
13881388
{Name: "NodeUnschedulable"},
1389-
{Name: "NodeResourcesFit"},
13901389
{Name: "NodeName"},
1391-
{Name: "NodePorts"},
1390+
{Name: "TaintToleration"},
13921391
{Name: "NodeAffinity"},
1392+
{Name: "NodePorts"},
1393+
{Name: "NodeResourcesFit"},
13931394
{Name: "VolumeRestrictions"},
1394-
{Name: "TaintToleration"},
13951395
{Name: "EBSLimits"},
13961396
{Name: "GCEPDLimits"},
13971397
{Name: "NodeVolumeLimits"},
@@ -1456,12 +1456,12 @@ func TestAlgorithmProviderCompatibility(t *testing.T) {
14561456
},
14571457
"FilterPlugin": {
14581458
{Name: "NodeUnschedulable"},
1459-
{Name: "NodeResourcesFit"},
14601459
{Name: "NodeName"},
1461-
{Name: "NodePorts"},
1460+
{Name: "TaintToleration"},
14621461
{Name: "NodeAffinity"},
1462+
{Name: "NodePorts"},
1463+
{Name: "NodeResourcesFit"},
14631464
{Name: "VolumeRestrictions"},
1464-
{Name: "TaintToleration"},
14651465
{Name: "EBSLimits"},
14661466
{Name: "GCEPDLimits"},
14671467
{Name: "NodeVolumeLimits"},
@@ -1545,12 +1545,12 @@ func TestPluginsConfigurationCompatibility(t *testing.T) {
15451545
},
15461546
"FilterPlugin": {
15471547
{Name: "NodeUnschedulable"},
1548-
{Name: "NodeResourcesFit"},
15491548
{Name: "NodeName"},
1550-
{Name: "NodePorts"},
1549+
{Name: "TaintToleration"},
15511550
{Name: "NodeAffinity"},
1551+
{Name: "NodePorts"},
1552+
{Name: "NodeResourcesFit"},
15521553
{Name: "VolumeRestrictions"},
1553-
{Name: "TaintToleration"},
15541554
{Name: "EBSLimits"},
15551555
{Name: "GCEPDLimits"},
15561556
{Name: "NodeVolumeLimits"},

0 commit comments

Comments
 (0)