chore: Replace deprecated Poll with PollUntilContextTimeout

quay · Aug 21, 2023 · c3b4657 · c3b4657
1 parent 618b99a
commit c3b4657
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/controllers/quay/features.go b/controllers/quay/features.go
@@ -181,10 +181,12 @@ func (r *QuayRegistryReconciler) checkRoutesAvailable(
 	// Wait until `status.ingress` is populated (should be immediately).
 	r.Log.Info("cluster supports `Routes` API")
 	var rt routev1.Route
-	if err := wait.Poll(
+	if err := wait.PollUntilContextTimeout(
+		ctx,
 		time.Second,
 		5*time.Minute,
-		func() (done bool, err error) {
+		false,
+		func(ctx context.Context) (done bool, err error) {
 			routensn := types.NamespacedName{
 				Name:      fmt.Sprintf("%s-test-route", quay.GetName()),
 				Namespace: quay.GetNamespace(),

diff --git a/controllers/quay/quayregistry_controller.go b/controllers/quay/quayregistry_controller.go
@@ -921,10 +921,12 @@ func (r *QuayRegistryReconciler) createOrUpdateObject(
 			return err
 		}
 
-		if err := wait.Poll(
+		if err := wait.PollUntilContextTimeout(
+			ctx,
 			creationPollInterval,
 			creationPollTimeout,
-			func() (bool, error) {
+			false,
+			func(ctx context.Context) (bool, error) {
 				if err := r.Client.Create(ctx, obj); err != nil {
 					if errors.IsAlreadyExists(err) {
 						log.Info("immutable resource being deleted, retry")