Merge pull request #2949 from jackfrancis/e2e-delete-op-timeout

Discrete timeout for service deletes in E2E
kubernetes-sigs · Dec 19, 2022 · e401d0b · e401d0b
2 parents c1b8d85 + 16e28fe
commit e401d0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/test/e2e/azure_lb.go b/test/e2e/azure_lb.go
@@ -177,7 +177,7 @@ func AzureLBSpec(ctx context.Context, inputGetter func() AzureLBSpecInput) {
 				return err
 			}
 			return nil
-		}, retryableOperationTimeout, retryableOperationSleepBetweenRetries).Should(Succeed())
+		}, retryableDeleteOperationTimeout, retryableOperationSleepBetweenRetries).Should(Succeed())
 		Logf("waiting for the ilb service to be deleted: %s", ilbService.Name)
 		Eventually(func() bool {
 			_, err := servicesClient.Get(ctx, ilbService.GetName(), metav1.GetOptions{})
@@ -268,7 +268,7 @@ func AzureLBSpec(ctx context.Context, inputGetter func() AzureLBSpecInput) {
 			return err
 		}
 		return nil
-	}, retryableOperationTimeout, retryableOperationSleepBetweenRetries).Should(Succeed())
+	}, retryableDeleteOperationTimeout, retryableOperationSleepBetweenRetries).Should(Succeed())
 	Logf("waiting for the external LB service to be deleted: %s", elbService.Name)
 	Eventually(func() bool {
 		_, err := servicesClient.Get(ctx, elbService.GetName(), metav1.GetOptions{})

diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go
@@ -74,6 +74,7 @@ const (
 	sshPort                               = "22"
 	deleteOperationTimeout                = 20 * time.Minute
 	retryableOperationTimeout             = 30 * time.Second
+	retryableDeleteOperationTimeout       = 3 * time.Minute
 	retryableOperationSleepBetweenRetries = 3 * time.Second
 )