diff --git a/test/e2e/apps/deployment.go b/test/e2e/apps/deployment.go index d26f2a114ed..c0b414731a3 100644 --- a/test/e2e/apps/deployment.go +++ b/test/e2e/apps/deployment.go @@ -246,7 +246,7 @@ var _ = SIGDescribe("Deployment", func() { framework.ExpectNoError(err, "failed to see %v event", watch.Added) ginkgo.By("waiting for all Replicas to be Ready") - ctx, cancel = context.WithTimeout(context.Background(), 1*time.Minute) + ctx, cancel = context.WithTimeout(context.Background(), f.Timeouts.PodStart) defer cancel() _, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) { if deployment, ok := event.Object.(*appsv1.Deployment); ok { @@ -305,7 +305,7 @@ var _ = SIGDescribe("Deployment", func() { framework.ExpectNoError(err, "failed to see %v event", watch.Modified) ginkgo.By("waiting for Replicas to scale") - ctx, cancel = context.WithTimeout(context.Background(), 1*time.Minute) + ctx, cancel = context.WithTimeout(context.Background(), f.Timeouts.PodStart) defer cancel() _, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) { if deployment, ok := event.Object.(*appsv1.Deployment); ok { @@ -384,7 +384,7 @@ var _ = SIGDescribe("Deployment", func() { framework.ExpectEqual(deploymentGet.Spec.Template.Spec.Containers[0].Image, testDeploymentUpdateImage, "failed to update image") framework.ExpectEqual(deploymentGet.ObjectMeta.Labels["test-deployment"], "updated", "failed to update labels") - ctx, cancel = context.WithTimeout(context.Background(), 1*time.Minute) + ctx, cancel = context.WithTimeout(context.Background(), f.Timeouts.PodStart) defer cancel() _, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) { if deployment, ok := event.Object.(*appsv1.Deployment); ok { @@ -438,7 +438,7 @@ var _ = SIGDescribe("Deployment", func() { framework.ExpectNoError(err, "failed to convert the unstructured response to a Deployment") framework.ExpectEqual(deploymentGet.Spec.Template.Spec.Containers[0].Image, testDeploymentUpdateImage, "failed to update image") framework.ExpectEqual(deploymentGet.ObjectMeta.Labels["test-deployment"], "updated", "failed to update labels") - ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second) + ctx, cancel = context.WithTimeout(context.Background(), f.Timeouts.PodStart) defer cancel() _, err = watchtools.Until(ctx, deploymentsList.ResourceVersion, w, func(event watch.Event) (bool, error) { if deployment, ok := event.Object.(*appsv1.Deployment); ok { diff --git a/test/e2e/apps/rc.go b/test/e2e/apps/rc.go index 83f780eed90..289e6232872 100644 --- a/test/e2e/apps/rc.go +++ b/test/e2e/apps/rc.go @@ -165,7 +165,7 @@ var _ = SIGDescribe("ReplicationController", func() { ginkgo.By("waiting for available Replicas") eventFound = false - ctx, cancel = context.WithTimeout(context.Background(), 120*time.Second) + ctx, cancel = context.WithTimeout(context.Background(), f.Timeouts.PodStart) defer cancel() _, err = watchUntilWithoutRetry(ctx, retryWatcher, func(watchEvent watch.Event) (bool, error) { var rc *v1.ReplicationController @@ -281,7 +281,7 @@ var _ = SIGDescribe("ReplicationController", func() { framework.ExpectNoError(err, "Failed to patch ReplicationControllerScale") ginkgo.By("waiting for RC to be modified") eventFound = false - ctx, cancel = context.WithTimeout(context.Background(), 60*time.Second) + ctx, cancel = context.WithTimeout(context.Background(), f.Timeouts.PodStart) defer cancel() _, err = watchUntilWithoutRetry(ctx, retryWatcher, func(watchEvent watch.Event) (bool, error) { if watchEvent.Type != watch.Modified { diff --git a/test/e2e/apps/replica_set.go b/test/e2e/apps/replica_set.go index 9ae4ff339a4..6a7d6652838 100644 --- a/test/e2e/apps/replica_set.go +++ b/test/e2e/apps/replica_set.go @@ -502,7 +502,7 @@ func testRSLifeCycle(f *framework.Framework) { _, err = f.ClientSet.AppsV1().ReplicaSets(ns).Patch(context.TODO(), rsName, types.StrategicMergePatchType, []byte(rsPatch), metav1.PatchOptions{}) framework.ExpectNoError(err, "failed to patch ReplicaSet") - ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) + ctx, cancel := context.WithTimeout(context.Background(), f.Timeouts.PodStart) defer cancel() _, err = watchtools.Until(ctx, rsList.ResourceVersion, w, func(event watch.Event) (bool, error) { if rset, ok := event.Object.(*appsv1.ReplicaSet); ok { diff --git a/test/e2e/common/node/pods.go b/test/e2e/common/node/pods.go index 340aea757a2..2274fa6413c 100644 --- a/test/e2e/common/node/pods.go +++ b/test/e2e/common/node/pods.go @@ -59,7 +59,6 @@ const ( maxBackOffTolerance = time.Duration(1.3 * float64(kubelet.MaxContainerBackOff)) podRetryPeriod = 1 * time.Second podRetryTimeout = 1 * time.Minute - podReadyTimeout = 2 * time.Minute ) // testHostIP tests that a pod gets a host IP @@ -931,7 +930,7 @@ var _ = SIGDescribe("Pods", func() { framework.ExpectNoError(err, "failed to create Pod %v in namespace %v", testPod.ObjectMeta.Name, testNamespaceName) ginkgo.By("watching for Pod to be ready") - ctx, cancel := context.WithTimeout(context.Background(), podReadyTimeout) + ctx, cancel := context.WithTimeout(context.Background(), f.Timeouts.PodStart) defer cancel() _, err = watchtools.Until(ctx, podsList.ResourceVersion, w, func(event watch.Event) (bool, error) { if pod, ok := event.Object.(*v1.Pod); ok { diff --git a/test/e2e/framework/replicaset/wait.go b/test/e2e/framework/replicaset/wait.go index 7bac05536c7..a8a9b2aadf0 100644 --- a/test/e2e/framework/replicaset/wait.go +++ b/test/e2e/framework/replicaset/wait.go @@ -30,7 +30,7 @@ import ( // WaitForReadyReplicaSet waits until the replicaset has all of its replicas ready. func WaitForReadyReplicaSet(c clientset.Interface, ns, name string) error { - err := wait.Poll(framework.Poll, framework.PollShortTimeout, func() (bool, error) { + err := wait.Poll(framework.Poll, framework.PodStartTimeout, func() (bool, error) { rs, err := c.AppsV1().ReplicaSets(ns).Get(context.TODO(), name, metav1.GetOptions{}) if err != nil { return false, err @@ -45,7 +45,7 @@ func WaitForReadyReplicaSet(c clientset.Interface, ns, name string) error { // WaitForReplicaSetTargetAvailableReplicas waits for .status.availableReplicas of a RS to equal targetReplicaNum func WaitForReplicaSetTargetAvailableReplicas(c clientset.Interface, replicaSet *appsv1.ReplicaSet, targetReplicaNum int32) error { - return WaitForReplicaSetTargetAvailableReplicasWithTimeout(c, replicaSet, targetReplicaNum, framework.PollShortTimeout) + return WaitForReplicaSetTargetAvailableReplicasWithTimeout(c, replicaSet, targetReplicaNum, framework.PodStartTimeout) } // WaitForReplicaSetTargetAvailableReplicasWithTimeout waits for .status.availableReplicas of a RS to equal targetReplicaNum