Cache node taints in scheduler NodeInfo

2016-10-21 11:33:09 +02:00
parent be2bb39964
commit 7387bc0572
2 changed files with 18 additions and 6 deletions
--- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go
+++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go
@@ -1119,12 +1119,7 @@ func (c *PodAffinityChecker) satisfiesPodsAffinityAntiAffinity(pod *v1.Pod, node
 }

 func PodToleratesNodeTaints(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (bool, []algorithm.PredicateFailureReason, error) {
-	node := nodeInfo.Node()
-	if node == nil {
-		return false, nil, fmt.Errorf("node not found")
-	}
-
-	taints, err := v1.GetTaintsFromNodeAnnotations(node.Annotations)
+	taints, err := nodeInfo.Taints()
 	if err != nil {
 		return false, nil, err
 	}