github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-06 19:52:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84054 from ahg-g/ahg-gp

Browse Source 
GeneralPredicate as framework plugin config
This commit is contained in:
Kubernetes Prow Robot
2019-10-17 21:19:58 -07:00
committed by GitHub
parent f9acca889c 517116921b
commit d1a79f136b
4 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,6 @@ func TestSchedulerCreationFromConfigMap(t *testing.T) {
"CheckNodeDiskPressure",
"CheckNodeMemoryPressure",
"CheckNodePIDPressure",
"GeneralPredicates",
"MatchInterPodAffinity",
"MaxAzureDiskVolumeCount",
"MaxEBSVolumeCount",
@@ -143,6 +142,10 @@ func TestSchedulerCreationFromConfigMap(t *testing.T) {
),
expectedPlugins: map[string][]kubeschedulerconfig.Plugin{
"FilterPlugin": {
{Name: "NodeResources"},
{Name: "NodeName"},
{Name: "NodePorts"},
{Name: "NodeAffinity"},
{Name: "VolumeRestrictions"},
{Name: "TaintToleration"},
{Name: "NodeVolumeLimits"},
@@ -200,7 +203,6 @@ kind: Policy
"CheckNodeDiskPressure",
"CheckNodeMemoryPressure",
"CheckNodePIDPressure",
"GeneralPredicates",
"MatchInterPodAffinity",
"MaxAzureDiskVolumeCount",
"MaxEBSVolumeCount",
@@ -214,6 +216,10 @@ kind: Policy
),
expectedPlugins: map[string][]kubeschedulerconfig.Plugin{
"FilterPlugin": {
{Name: "NodeResources"},
{Name: "NodeName"},
{Name: "NodePorts"},
{Name: "NodeAffinity"},
{Name: "VolumeRestrictions"},
{Name: "TaintToleration"},
{Name: "NodeVolumeLimits"},