Merge pull request #44814 from weizhanxu/controllerRef_no_Need_Check_nil_again

Automatic merge from submit-queue (batch tested with PRs 41530, 44814, 43620, 41985) no need check is nil, because has checked before **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```

Merge pull request #44814 from weizhanxu/controllerRef_no_Need_Check_nil_again
58aebcd6 · Kubernetes Submit Queue · GitHub · d6fd997d · a7dd554c · 58aebcd6
Commit 58aebcd6 authored Apr 28, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

node_prefer_avoid_pods.go .../scheduler/algorithm/priorities/node_prefer_avoid_pods.go +2 -4

No files found.
--- a/plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods.go
+++ b/plugin/pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods.go
@@ -51,10 +51,8 @@ func CalculateNodePreferAvoidPodsPriorityMap(pod *v1.Pod, meta interface{}, node
 	}
 	for i := range avoids.PreferAvoidPods {
 		avoid := &avoids.PreferAvoidPods[i]
-		if controllerRef != nil {
-			if avoid.PodSignature.PodController.Kind == controllerRef.Kind && avoid.PodSignature.PodController.UID == controllerRef.UID {
-				return schedulerapi.HostPriority{Host: node.Name, Score: 0}, nil
-			}
+		if avoid.PodSignature.PodController.Kind == controllerRef.Kind && avoid.PodSignature.PodController.UID == controllerRef.UID {
+			return schedulerapi.HostPriority{Host: node.Name, Score: 0}, nil
 		}
 	}
 	return schedulerapi.HostPriority{Host: node.Name, Score: 10}, nil