Merge pull request #21935 from janetkuo/nil-pointer

pkg/util/deployment/deployment.go

@@ -334,8 +334,10 @@ func SetFromReplicaSetTemplate(deployment *extensions.Deployment, template api.P
 func GetReplicaCountForReplicaSets(replicaSets []*extensions.ReplicaSet) int {
 	totalReplicaCount := 0
 	for _, rs := range replicaSets {
+		if rs != nil {
 			totalReplicaCount += rs.Spec.Replicas
 		}
+	}
 	return totalReplicaCount
 }
 
@@ -343,8 +345,10 @@ func GetReplicaCountForReplicaSets(replicaSets []*extensions.ReplicaSet) int {
 func GetActualReplicaCountForReplicaSets(replicaSets []*extensions.ReplicaSet) int {
 	totalReplicaCount := 0
 	for _, rs := range replicaSets {
+		if rs != nil {
 			totalReplicaCount += rs.Status.Replicas
 		}
+	}
 	return totalReplicaCount
 }
 
@@ -388,6 +392,7 @@ func IsPodAvailable(pod *api.Pod, minReadySeconds int) bool {
 func GetPodsForReplicaSets(c clientset.Interface, replicaSets []*extensions.ReplicaSet) ([]api.Pod, error) {
 	allPods := map[string]api.Pod{}
 	for _, rs := range replicaSets {
+		if rs != nil {
 			selector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector)
 			if err != nil {
 				return nil, fmt.Errorf("invalid label selector: %v", err)
@@ -401,6 +406,7 @@ func GetPodsForReplicaSets(c clientset.Interface, replicaSets []*extensions.Repl
 				allPods[pod.Name] = pod
 			}
 		}
+	}
 	requiredPods := []api.Pod{}
 	for _, pod := range allPods {
 		requiredPods = append(requiredPods, pod)