From b267ede42cad2d514caeee7fd49d6ce35c143f7d Mon Sep 17 00:00:00 2001
From: Janet Kuo <chiachenk@google.com>
Date: Fri, 19 Feb 2016 15:53:34 -0800
Subject: [PATCH] Address comments

---
 pkg/util/deployment/deployment.go | 5 +----
 test/e2e/util.go                  | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/util/deployment/deployment.go b/pkg/util/deployment/deployment.go
index 2a310e6e6d1..5f5baa782e3 100644
--- a/pkg/util/deployment/deployment.go
+++ b/pkg/util/deployment/deployment.go
@@ -197,14 +197,11 @@ func getReadyPodsCount(pods []api.Pod, minReadySeconds int) int {
 }
 
 func IsPodAvailable(pod *api.Pod, minReadySeconds int) bool {
-	if !api.IsPodReady(pod) {
-		return false
-	}
 	// Check if we've passed minReadySeconds since LastTransitionTime
 	// If so, this pod is ready
 	for _, c := range pod.Status.Conditions {
 		// we only care about pod ready conditions
-		if c.Type == api.PodReady {
+		if c.Type == api.PodReady && c.Status == api.ConditionTrue {
 			// 2 cases that this ready condition is valid (passed minReadySeconds, i.e. the pod is ready):
 			// 1. minReadySeconds <= 0
 			// 2. LastTransitionTime (is set) + minReadySeconds (>0) < current time
diff --git a/test/e2e/util.go b/test/e2e/util.go
index b7c4f0242ee..0913b8d6a03 100644
--- a/test/e2e/util.go
+++ b/test/e2e/util.go
@@ -2124,6 +2124,7 @@ func waitForDeploymentStatus(c clientset.Interface, ns, deploymentName string, d
 		}
 		if totalCreated > maxCreated {
 			logReplicaSetsOfDeployment(deploymentName, oldRSs, newRS)
+			logPodsOfReplicaSets(c, allRSs, minReadySeconds)
 			return false, fmt.Errorf("total pods created: %d, more than the max allowed: %d", totalCreated, maxCreated)
 		}
 		if totalAvailable < minAvailable {
@@ -2137,10 +2138,12 @@ func waitForDeploymentStatus(c clientset.Interface, ns, deploymentName string, d
 			// Verify replica sets.
 			if deploymentutil.GetReplicaCountForReplicaSets(oldRSs) != 0 {
 				logReplicaSetsOfDeployment(deploymentName, oldRSs, newRS)
+				logPodsOfReplicaSets(c, allRSs, minReadySeconds)
 				return false, fmt.Errorf("old replica sets are not fully scaled down")
 			}
 			if deploymentutil.GetReplicaCountForReplicaSets([]*extensions.ReplicaSet{newRS}) != desiredUpdatedReplicas {
 				logReplicaSetsOfDeployment(deploymentName, oldRSs, newRS)
+				logPodsOfReplicaSets(c, allRSs, minReadySeconds)
 				return false, fmt.Errorf("new replica sets is not fully scaled up")
 			}
 			return true, nil