From ce8d5f25161d3094628cf543d3b9fd0c810aaa50 Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Tue, 10 Jun 2025 17:27:45 +0200 Subject: [PATCH] refactor: requeue deprecated, migrating to requeue after (#837) Signed-off-by: Dario Tranchitella --- controllers/certificate_lifecycle_controller.go | 2 +- controllers/soot/controllers/migrate.go | 3 ++- controllers/soot/manager.go | 4 ++-- controllers/tenantcontrolplane_controller.go | 12 ++++++------ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/controllers/certificate_lifecycle_controller.go b/controllers/certificate_lifecycle_controller.go index ec3051a..f4592a9 100644 --- a/controllers/certificate_lifecycle_controller.go +++ b/controllers/certificate_lifecycle_controller.go @@ -99,7 +99,7 @@ func (s *CertificateLifecycle) Reconcile(ctx context.Context, request reconcile. logger.Info("certificate is still valid, enqueuing back", "after", after.String()) - return reconcile.Result{Requeue: true, RequeueAfter: after}, nil + return reconcile.Result{RequeueAfter: after}, nil } func (s *CertificateLifecycle) extractCertificateFromBareSecret(secret corev1.Secret) (*x509.Certificate, error) { diff --git a/controllers/soot/controllers/migrate.go b/controllers/soot/controllers/migrate.go index 56ebb7a..f06b78c 100644 --- a/controllers/soot/controllers/migrate.go +++ b/controllers/soot/controllers/migrate.go @@ -6,6 +6,7 @@ package controllers import ( "context" "fmt" + "time" "github.com/go-logr/logr" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" @@ -45,7 +46,7 @@ func (m *Migrate) Reconcile(ctx context.Context, _ reconcile.Request) (reconcile } // Cannot detect the status of the TenantControlPlane, enqueuing back if tcp.Status.Kubernetes.Version.Status == nil { - return reconcile.Result{Requeue: true}, nil + return reconcile.Result{RequeueAfter: time.Second}, nil } switch *tcp.Status.Kubernetes.Version.Status { diff --git a/controllers/soot/manager.go b/controllers/soot/manager.go index 5392aff..ecfcc1c 100644 --- a/controllers/soot/manager.go +++ b/controllers/soot/manager.go @@ -213,7 +213,7 @@ func (m *Manager) Reconcile(ctx context.Context, request reconcile.Request) (res return nil }) - return reconcile.Result{Requeue: true}, finalizerErr + return reconcile.Result{RequeueAfter: time.Second}, finalizerErr } // Generating the manager and starting it: // in case of any error, reconciling the request to start it back from the beginning. @@ -377,7 +377,7 @@ func (m *Manager) Reconcile(ctx context.Context, request reconcile.Request) (res completedCh: completedCh, } - return reconcile.Result{Requeue: true}, nil + return reconcile.Result{RequeueAfter: time.Second}, nil } func (m *Manager) SetupWithManager(mgr manager.Manager) error { diff --git a/controllers/tenantcontrolplane_controller.go b/controllers/tenantcontrolplane_controller.go index 52916a7..e34e168 100644 --- a/controllers/tenantcontrolplane_controller.go +++ b/controllers/tenantcontrolplane_controller.go @@ -101,11 +101,11 @@ func (r *TenantControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.R case errors.As(err, &mutex.ErrTimeout): log.Info("acquire timed out, current process is blocked by another reconciliation") - return ctrl.Result{Requeue: true}, nil + return ctrl.Result{RequeueAfter: time.Second}, nil case errors.As(err, &mutex.ErrCancelled): log.Info("acquire cancelled") - return ctrl.Result{Requeue: true}, nil + return ctrl.Result{RequeueAfter: time.Second}, nil default: log.Error(err, "acquire failed") @@ -125,7 +125,7 @@ func (r *TenantControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.R if errors.Is(err, ErrMissingDataStore) { log.Info(err.Error()) - return ctrl.Result{Requeue: true}, nil + return ctrl.Result{RequeueAfter: time.Second}, nil } log.Error(err, "cannot retrieve the DataStore for the given instance") @@ -186,7 +186,7 @@ func (r *TenantControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.R if kamajierrors.ShouldReconcileErrorBeIgnored(err) { log.V(1).Info("sentinel error, enqueuing back request", "error", err.Error()) - return ctrl.Result{Requeue: true}, nil + return ctrl.Result{RequeueAfter: time.Second}, nil } log.Error(err, "handling of resource failed", "resource", resource.GetName()) @@ -202,7 +202,7 @@ func (r *TenantControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.R if kamajierrors.ShouldReconcileErrorBeIgnored(err) { log.V(1).Info("sentinel error, enqueuing back request", "error", err.Error()) - return ctrl.Result{Requeue: true}, nil + return ctrl.Result{RequeueAfter: time.Second}, nil } log.Error(err, "update of the resource failed", "resource", resource.GetName()) @@ -215,7 +215,7 @@ func (r *TenantControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.R if result == resources.OperationResultEnqueueBack { log.Info("requested enqueuing back", "resources", resource.GetName()) - return ctrl.Result{Requeue: true}, nil + return ctrl.Result{RequeueAfter: time.Second}, nil } }