From 8b24eafbedb9786d50586e890563a289a2c294cb Mon Sep 17 00:00:00 2001
From: tstromberg <tstromberg@google.com>
Date: Wed, 30 Oct 2019 14:36:15 -0700
Subject: [PATCH] Fix pod list retry, reset start timer

---
 test/integration/helpers.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
index 18f37848193d..a19b3ce96313 100644
--- a/test/integration/helpers.go
+++ b/test/integration/helpers.go
@@ -228,7 +228,9 @@ func PodWait(ctx context.Context, t *testing.T, profile string, ns string, selec
 		pods, err := client.CoreV1().Pods(ns).List(listOpts)
 		if err != nil {
 			t.Logf("WARNING: pod list for %q %q returned: %v", ns, selector, err)
-			return false, err
+			// Don't return the error upwards so that this is retried, in case the apiserver is rescheduled
+			podStart = time.Time{}
+			return false, nil
 		}
 		if len(pods.Items) == 0 {
 			podStart = time.Time{}