Merge pull request #19391 from timstclair/pod-waiting

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-15 09:33:38 -08:00
commit 7f095c1f8e

View File

@ -525,6 +525,10 @@ func waitForPodCondition(c *client.Client, ns, podName, desc string, timeout tim
for start := time.Now(); time.Since(start) < timeout; time.Sleep(poll) { for start := time.Now(); time.Since(start) < timeout; time.Sleep(poll) {
pod, err := c.Pods(ns).Get(podName) pod, err := c.Pods(ns).Get(podName)
if err != nil { if err != nil {
if apierrs.IsNotFound(err) {
Logf("Pod %q in namespace %q disappeared. Error: %v", podName, ns, err)
return err
}
// Aligning this text makes it much more readable // Aligning this text makes it much more readable
Logf("Get pod %[1]s in namespace '%[2]s' failed, ignoring for %[3]v. Error: %[4]v", Logf("Get pod %[1]s in namespace '%[2]s' failed, ignoring for %[3]v. Error: %[4]v",
podName, ns, poll, err) podName, ns, poll, err)