Shorten initial pod start time to 30s in e2e, since 4566 is closed

test/e2e/framework/util.go

@@ -86,8 +86,7 @@ const (
 	// How long to wait for the pod to be listable
 	PodListTimeout = time.Minute
 	// Initial pod start can be delayed O(minutes) by slow docker pulls
-	// TODO: Make this 30 seconds once #4566 is resolved.
-	PodStartTimeout = 5 * time.Minute
+	PodStartTimeout = 30 * time.Second
 
 	// How long to wait for the pod to no longer be running
 	podNoLongerRunningTimeout = 30 * time.Second

test/e2e/pods.go

@@ -815,7 +815,7 @@ var _ = framework.KubeDescribe("Pods", func() {
 
 		wr := watch.NewRecorder(w)
 		event, err := watch.Until(
-			framework.PodStartTimeout, wr,
+			framework.PodReadyBeforeTimeout, wr,
 			// check for the first container to fail at least once
 			func(evt watch.Event) (bool, error) {
 				switch t := evt.Object.(type) {