From 37585b06e0dad95da1a47845e2728133d5f01153 Mon Sep 17 00:00:00 2001 From: gmarek Date: Tue, 7 Feb 2017 13:47:57 +0100 Subject: [PATCH] Scheduler doesn't schedule Pods not tolerating NoExecute Taints --- plugin/pkg/scheduler/algorithm/predicates/predicates.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index 00ad5a788c6..0d527c06bf6 100644 --- 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 }