Merge pull request #83998 from draveness/feature/node-affinity-score-plugin

feat(scheduler): implement node affinity as score plugin
This commit is contained in:
Kubernetes Prow Robot
2019-10-17 08:24:38 -07:00
committed by GitHub
6 changed files with 226 additions and 19 deletions

View File

@@ -140,7 +140,6 @@ func TestSchedulerCreationFromConfigMap(t *testing.T) {
"BalancedResourceAllocation",
"InterPodAffinityPriority",
"LeastRequestedPriority",
"NodeAffinityPriority",
"SelectorSpreadPriority",
),
expectedPlugins: map[string][]kubeschedulerconfig.Plugin{
@@ -152,6 +151,7 @@ func TestSchedulerCreationFromConfigMap(t *testing.T) {
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 1},
{Name: "NodeAffinity", Weight: 1},
{Name: "NodePreferAvoidPods", Weight: 10000},
{Name: "TaintToleration", Weight: 1},
},
@@ -211,7 +211,6 @@ kind: Policy
"BalancedResourceAllocation",
"InterPodAffinityPriority",
"LeastRequestedPriority",
"NodeAffinityPriority",
"SelectorSpreadPriority",
),
expectedPlugins: map[string][]kubeschedulerconfig.Plugin{
@@ -223,6 +222,7 @@ kind: Policy
},
"ScorePlugin": {
{Name: "ImageLocality", Weight: 1},
{Name: "NodeAffinity", Weight: 1},
{Name: "NodePreferAvoidPods", Weight: 10000},
{Name: "TaintToleration", Weight: 1},
},