Merge pull request #41068 from gmarek/sched-taint

Automatic merge from submit-queue (batch tested with PRs 41064, 41090, 41068, 41073, 40882) Scheduler doesn't schedule Pods not tolerating NoExecute Taints cc @kevin-wangzefeng

Merge pull request #41068 from gmarek/sched-taint
1a0b8550 · Kubernetes Submit Queue · GitHub · d408ab05 · 37585b06 · 1a0b8550
Commit 1a0b8550 authored Feb 07, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

predicates.go plugin/pkg/scheduler/algorithm/predicates/predicates.go +2 -2

No files found.
--- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go
+++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go
@@ -1159,8 +1159,8 @@ func PodToleratesNodeTaints(pod *v1.Pod, meta interface{}, nodeInfo *schedulerca
 	}

 	if v1.TolerationsTolerateTaintsWithFilter(tolerations, taints, func(t *v1.Taint) bool {
-		// PodToleratesNodeTaints is only interested in NoSchedule taints.
-		return t.Effect == v1.TaintEffectNoSchedule
+		// PodToleratesNodeTaints is only interested in NoSchedule and NoExecute taints.
+		return t.Effect == v1.TaintEffectNoSchedule || t.Effect == v1.TaintEffectNoExecute
 	}) {
 		return true, nil, nil
 	}