github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-02 01:39:02 +00:00
Code Issues Projects Releases Wiki Activity

[migration phase 1] NoDiskConflict as filter plugin

Browse Source
This commit is contained in:
notpad
2019-10-11 18:35:30 +08:00
parent d6eba1df14
commit 9e426a6be1
7 changed files with 366 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/integration/scheduler/scheduler_test.go
View File

@@ -136,7 +136,6 @@ func TestSchedulerCreationFromConfigMap(t *testing.T) {
"MaxCSIVolumeCountPred",
"MaxEBSVolumeCount",
"MaxGCEPDVolumeCount",
"NoDiskConflict",
"NoVolumeZoneConflict",
),
expectedPrioritizers: sets.NewString(
@@ -149,8 +148,12 @@ func TestSchedulerCreationFromConfigMap(t *testing.T) {
"ImageLocalityPriority",
),
expectedPlugins: map[string][]kubeschedulerconfig.Plugin{
"FilterPlugin": {{Name: "TaintToleration"}, {Name: "VolumeBinding"}},
"ScorePlugin": {{Name: "TaintToleration", Weight: 1}},
"FilterPlugin": {
{Name: "VolumeRestrictions"},
{Name: "TaintToleration"},
{Name: "VolumeBinding"},
},
"ScorePlugin": {{Name: "TaintToleration", Weight: 1}},
},
},
{
@@ -202,7 +205,6 @@ kind: Policy
"MaxCSIVolumeCountPred",
"MaxEBSVolumeCount",
"MaxGCEPDVolumeCount",
"NoDiskConflict",
"NoVolumeZoneConflict",
),
expectedPrioritizers: sets.NewString(
@@ -215,8 +217,12 @@ kind: Policy
"ImageLocalityPriority",
),
expectedPlugins: map[string][]kubeschedulerconfig.Plugin{
"FilterPlugin": {{Name: "TaintToleration"}, {Name: "VolumeBinding"}},
"ScorePlugin": {{Name: "TaintToleration", Weight: 1}},
"FilterPlugin": {
{Name: "VolumeRestrictions"},
{Name: "TaintToleration"},
{Name: "VolumeBinding"},
},
"ScorePlugin": {{Name: "TaintToleration", Weight: 1}},
},
},
{