Migrate to new controller-runtime wait

mariadb-operator · Oct 10, 2023 · be7d5cc · be7d5cc
1 parent a62b295
commit be7d5cc
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/pkg/handler/recovery.go b/pkg/handler/recovery.go
@@ -112,10 +112,8 @@ func (r *Recovery) Delete(w http.ResponseWriter, req *http.Request) {
 }
 
 func (r *Recovery) pollUntilRecovered(ctx context.Context) (*galera.Bootstrap, error) {
-	// TODO: bump apimachinery and migrate to PollUntilContextTimeout.
-	// See: https://pkg.go.dev/k8s.io/[email protected]/pkg/util/wait#PollUntilContextTimeout
 	var bootstrap *galera.Bootstrap
-	err := wait.PollImmediateUntilWithContext(ctx, 1*time.Second, func(context.Context) (bool, error) {
+	err := wait.PollUntilContextCancel(ctx, 1*time.Second, true, func(context.Context) (bool, error) {
 		b, err := r.recover()
 		if err != nil {
 			r.logger.Error(err, "error recovering galera from recovery log")