github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

move Taint and toleration predicate to its Score plugin

Browse Source
This commit is contained in:
SataQiu
2019-12-24 19:22:12 +08:00
parent 39d0710a4b
commit 21c916c3d2
13 changed files with 115 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/scheduler/algorithmprovider/defaults/defaults_test.go
View File

@@ -126,6 +126,7 @@ func TestCompatibility(t *testing.T) {
},
"PostFilterPlugin": {
{Name: "InterPodAffinity"},
{Name: "TaintToleration"},
},
"ScorePlugin": {
{Name: "NodeResourcesBalancedAllocation", Weight: 1},
@@ -166,6 +167,7 @@ func TestCompatibility(t *testing.T) {
},
"PostFilterPlugin": {
{Name: "InterPodAffinity"},
{Name: "TaintToleration"},
},
"ScorePlugin": {
{Name: "NodeResourcesBalancedAllocation", Weight: 1},
@@ -206,6 +208,7 @@ func TestCompatibility(t *testing.T) {
},
"PostFilterPlugin": {
{Name: "InterPodAffinity"},
{Name: "TaintToleration"},
},
"ScorePlugin": {
{Name: "NodeResourcesBalancedAllocation", Weight: 1},

2
pkg/scheduler/algorithmprovider/defaults/register_priorities.go
View File

@@ -86,7 +86,7 @@ func init() {
scheduler.RegisterPriorityMapReduceFunction(priorities.NodeAffinityPriority, priorities.CalculateNodeAffinityPriorityMap, priorities.CalculateNodeAffinityPriorityReduce, 1)
// Prioritizes nodes that marked with taint which pod can tolerate.
scheduler.RegisterPriorityMapReduceFunction(priorities.TaintTolerationPriority, priorities.ComputeTaintTolerationPriorityMap, priorities.ComputeTaintTolerationPriorityReduce, 1)
scheduler.RegisterPriorityMapReduceFunction(priorities.TaintTolerationPriority, nil, nil, 1)
// ImageLocalityPriority prioritizes nodes that have images requested by the pod present.
scheduler.RegisterPriorityMapReduceFunction(priorities.ImageLocalityPriority, nil, nil, 1)