Merge pull request #34346 from aveshagarwal/master-kube-fix-messages

Automatic merge from submit-queue

Fix confusing log messages

While debugging https://github.com/kubernetes/kubernetes/issues/33876 , I noticed following confusing message:

``` 
The status of Pod kibana-logging-v1-j99la is Running, waiting for it to be either Running or Failed
```
This commit is contained in:
Kubernetes Submit Queue 2016-10-08 00:39:17 -07:00 committed by GitHub
commit 28a53453cf

View File

@ -677,7 +677,7 @@ func WaitForPodsRunningReady(c *client.Client, ns string, minPods int32, timeout
}
} else {
if pod.Status.Phase != api.PodFailed {
Logf("The status of Pod %s is %s, waiting for it to be either Running or Failed", pod.ObjectMeta.Name, pod.Status.Phase)
Logf("The status of Pod %s is %s (Ready = false), waiting for it to be either Running (with Ready = true) or Failed", pod.ObjectMeta.Name, pod.Status.Phase)
badPods = append(badPods, pod)
} else if !hasReplicationControllersForPod(rcList, pod) {
Logf("Pod %s is Failed, but it's not controlled by a ReplicationController", pod.ObjectMeta.Name)