github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Address comments

Browse Source
This commit is contained in:
Janet Kuo 2016-02-19 15:53:34 -08:00
parent 6ceb221f8e
commit b267ede42c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/util/deployment/deployment.go
View File

@ -197,14 +197,11 @@ func getReadyPodsCount(pods []api.Pod, minReadySeconds int) int {
} }
func IsPodAvailable(pod *api.Pod, minReadySeconds int) bool { func IsPodAvailable(pod *api.Pod, minReadySeconds int) bool {
if !api.IsPodReady(pod) {
return false
}
// Check if we've passed minReadySeconds since LastTransitionTime // Check if we've passed minReadySeconds since LastTransitionTime
// If so, this pod is ready // If so, this pod is ready
for _, c := range pod.Status.Conditions { for _, c := range pod.Status.Conditions {
// we only care about pod ready 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): // 2 cases that this ready condition is valid (passed minReadySeconds, i.e. the pod is ready):
// 1. minReadySeconds <= 0 // 1. minReadySeconds <= 0
// 2. LastTransitionTime (is set) + minReadySeconds (>0) < current time // 2. LastTransitionTime (is set) + minReadySeconds (>0) < current time

3
test/e2e/util.go
View File

@ -2124,6 +2124,7 @@ func waitForDeploymentStatus(c clientset.Interface, ns, deploymentName string, d
} }
if totalCreated > maxCreated { if totalCreated > maxCreated {
logReplicaSetsOfDeployment(deploymentName, oldRSs, newRS) logReplicaSetsOfDeployment(deploymentName, oldRSs, newRS)
logPodsOfReplicaSets(c, allRSs, minReadySeconds)
return false, fmt.Errorf("total pods created: %d, more than the max allowed: %d", totalCreated, maxCreated) return false, fmt.Errorf("total pods created: %d, more than the max allowed: %d", totalCreated, maxCreated)
} }
if totalAvailable < minAvailable { if totalAvailable < minAvailable {
@ -2137,10 +2138,12 @@ func waitForDeploymentStatus(c clientset.Interface, ns, deploymentName string, d
// Verify replica sets. // Verify replica sets.
if deploymentutil.GetReplicaCountForReplicaSets(oldRSs) != 0 { if deploymentutil.GetReplicaCountForReplicaSets(oldRSs) != 0 {
logReplicaSetsOfDeployment(deploymentName, oldRSs, newRS) logReplicaSetsOfDeployment(deploymentName, oldRSs, newRS)
logPodsOfReplicaSets(c, allRSs, minReadySeconds)
return false, fmt.Errorf("old replica sets are not fully scaled down") return false, fmt.Errorf("old replica sets are not fully scaled down")
} }
if deploymentutil.GetReplicaCountForReplicaSets([]*extensions.ReplicaSet{newRS}) != desiredUpdatedReplicas { if deploymentutil.GetReplicaCountForReplicaSets([]*extensions.ReplicaSet{newRS}) != desiredUpdatedReplicas {
logReplicaSetsOfDeployment(deploymentName, oldRSs, newRS) logReplicaSetsOfDeployment(deploymentName, oldRSs, newRS)
logPodsOfReplicaSets(c, allRSs, minReadySeconds)
return false, fmt.Errorf("new replica sets is not fully scaled up") return false, fmt.Errorf("new replica sets is not fully scaled up")
} }
return true, nil return true, nil