Merge pull request #33086 from ivan4th/fix-possible-panic-in-pod-affinity-checker

Automatic merge from submit-queue Fix possible panic in PodAffinityChecker In `PodAffinityChecker.getMatchingAntiAffinityTerms()` `affinity.PodAntiAffinity` can be `nil` in this place. This problem occurs e.g. when `nil` is passed as `meta` to `PodAffinityChecker.InterPodAffinityMatches()`. Stumbled upon it while working on #31136 (someone PTAL at that PR too, I've submitted it a month ago and seemingly no one noticed it), kube-controller-manager was crashing there.

Merge pull request #33086 from ivan4th/fix-possible-panic-in-pod-affinity-checker
d17c6b90 · Kubernetes Submit Queue · GitHub · b2458866 · f758cb41 · d17c6b90
Commit d17c6b90 authored Sep 21, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go
+++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go
@@ -968,7 +968,7 @@ func (c *PodAffinityChecker) getMatchingAntiAffinityTerms(pod *api.Pod, allPods 
 		if err != nil {
 			return nil, err
 		}
-		if affinity.PodAntiAffinity != nil {
+		if affinity != nil && affinity.PodAntiAffinity != nil {
 			existingPodNode, err := c.info.GetNodeInfo(existingPod.Spec.NodeName)
 			if err != nil {
 				return nil, err