Fix use of deprecated reconcile.Result Requeue field. (#821)

Author: thegridman

controllers/coherencejob_controller.go

@@ -69,7 +69,7 @@ func (in *CoherenceJobReconciler) ReconcileDeployment(ctx context.Context, reque
 	// request for the same resource is already in progress so requeue this one.
 	if ok := in.Lock(request); !ok {
 		log.Info("CoherenceJob resource " + request.Namespace + "/" + request.Name + " is already locked, requeue request")
-		return reconcile.Result{Requeue: true, RequeueAfter: 0}, nil
+		return reconcile.Result{RequeueAfter: time.Second * 10}, nil
 	}
 	// Make sure that the request is unlocked when this method exits
 	defer in.Unlock(request)

controllers/errorhandling/error_handler.go

@@ -98,10 +98,10 @@ func (eh *ErrorHandler) HandleError(ctx context.Context, err error, resource coh
 		return eh.attemptRecovery(ctx, err, resource)
 	case ErrorCategoryPermanent:
 		// For permanent errors, don't requeue
-		return reconcile.Result{Requeue: false}, nil
+		return reconcile.Result{}, nil
 	default:
 		// For unknown errors, requeue with a short delay
-		return reconcile.Result{Requeue: true, RequeueAfter: 5 * time.Second}, nil
+		return reconcile.Result{RequeueAfter: 5 * time.Second}, nil
 	}
 }
 
@@ -360,7 +360,7 @@ func (eh *ErrorHandler) handleTransientError(resource coh.CoherenceResource) (re
 		"errorCount", count,
 		"backoff", backoff)
 
-	return reconcile.Result{Requeue: true, RequeueAfter: backoff}, nil
+	return reconcile.Result{RequeueAfter: backoff}, nil
 }
 
 // attemptRecovery attempts to recover from a recoverable error
@@ -371,7 +371,7 @@ func (eh *ErrorHandler) attemptRecovery(ctx context.Context, err error, resource
 		Namespace: resource.GetNamespace(),
 		Name:      resource.GetName(),
 	}, latest); err != nil {
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	// Get the annotations
@@ -391,7 +391,7 @@ func (eh *ErrorHandler) attemptRecovery(ctx context.Context, err error, resource
 					"resource", resource.GetName(),
 					"namespace", resource.GetNamespace(),
 					"lastAttempt", lastAttempt)
-				return reconcile.Result{Requeue: true, RequeueAfter: 1 * time.Minute}, nil
+				return reconcile.Result{RequeueAfter: 1 * time.Minute}, nil
 			}
 		}
 	}
@@ -402,7 +402,7 @@ func (eh *ErrorHandler) attemptRecovery(ctx context.Context, err error, resource
 
 	// Update the resource
 	if err := eh.Client.Update(ctx, latest); err != nil {
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	// Log the recovery attempt with detailed diagnostics
@@ -463,7 +463,7 @@ func (eh *ErrorHandler) attemptRecovery(ctx context.Context, err error, resource
 		eh.Log.Error(updateErr, "Failed to update resource with diagnostic information")
 	}
 
-	return reconcile.Result{Requeue: true, RequeueAfter: 30 * time.Second}, nil
+	return reconcile.Result{RequeueAfter: 30 * time.Second}, nil
 }
 
 // recoverFromServiceSuspensionFailure attempts to recover from a service suspension failure
@@ -485,7 +485,7 @@ func (eh *ErrorHandler) recoverFromServiceSuspensionFailure(ctx context.Context,
 		Namespace: resource.GetNamespace(),
 		Name:      resource.GetName(),
 	}, latest); err != nil {
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	// Check if this is a deletion and has the Coherence finalizer
@@ -503,7 +503,7 @@ func (eh *ErrorHandler) recoverFromServiceSuspensionFailure(ctx context.Context,
 		// Update the resource with the annotation
 		if err := eh.Client.Update(ctx, latest); err != nil {
 			eh.Log.Error(err, "Failed to add finalizer bypass annotation")
-			return reconcile.Result{Requeue: true}, err
+			return reconcile.Result{RequeueAfter: time.Minute}, err
 		}
 
 		eh.Log.Info("Added finalizer bypass annotation to resource",
@@ -515,7 +515,7 @@ func (eh *ErrorHandler) recoverFromServiceSuspensionFailure(ctx context.Context,
 	}
 
 	// 4. Return a result that requeues after a short delay to check if recovery was successful
-	return reconcile.Result{Requeue: true, RequeueAfter: 10 * time.Second}, nil
+	return reconcile.Result{RequeueAfter: 10 * time.Second}, nil
 }
 
 // recoverFromPDBIssue attempts to recover from Pod Disruption Budget issues
@@ -536,7 +536,7 @@ func (eh *ErrorHandler) recoverFromPDBIssue(ctx context.Context, resource coh.Co
 		Namespace: resource.GetNamespace(),
 		Name:      resource.GetName(),
 	}, latest); err != nil {
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	// Add diagnostic information
@@ -552,7 +552,7 @@ func (eh *ErrorHandler) recoverFromPDBIssue(ctx context.Context, resource coh.Co
 	// Update the resource with the annotation
 	if err := eh.Client.Update(ctx, latest); err != nil {
 		eh.Log.Error(err, "Failed to add PDB issue annotation")
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	eh.Log.Info("Added PDB issue annotation to resource",
@@ -563,7 +563,7 @@ func (eh *ErrorHandler) recoverFromPDBIssue(ctx context.Context, resource coh.Co
 		"Added PDB issue annotation to resource")
 
 	// Return a result that requeues after a delay
-	return reconcile.Result{Requeue: true, RequeueAfter: 30 * time.Second}, nil
+	return reconcile.Result{RequeueAfter: 30 * time.Second}, nil
 }
 
 // recoverFromStatefulSetPatchIssue attempts to recover from StatefulSet patching issues
@@ -583,7 +583,7 @@ func (eh *ErrorHandler) recoverFromStatefulSetPatchIssue(ctx context.Context, re
 		Namespace: resource.GetNamespace(),
 		Name:      resource.GetName(),
 	}, latest); err != nil {
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	// Add diagnostic information
@@ -598,7 +598,7 @@ func (eh *ErrorHandler) recoverFromStatefulSetPatchIssue(ctx context.Context, re
 	// Update the resource with the annotation
 	if err := eh.Client.Update(ctx, latest); err != nil {
 		eh.Log.Error(err, "Failed to add force-reconcile annotation")
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	eh.Log.Info("Added force-reconcile annotation to resource",
@@ -609,7 +609,7 @@ func (eh *ErrorHandler) recoverFromStatefulSetPatchIssue(ctx context.Context, re
 		"Added force-reconcile annotation to resource to address StatefulSet patching issue")
 
 	// Return a result that requeues after a delay
-	return reconcile.Result{Requeue: true, RequeueAfter: 10 * time.Second}, nil
+	return reconcile.Result{RequeueAfter: 10 * time.Second}, nil
 }
 
 // recoverFromQuotaIssue attempts to recover from resource quota issues
@@ -629,7 +629,7 @@ func (eh *ErrorHandler) recoverFromQuotaIssue(ctx context.Context, resource coh.
 		Namespace: resource.GetNamespace(),
 		Name:      resource.GetName(),
 	}, latest); err != nil {
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	// Add diagnostic information
@@ -645,7 +645,7 @@ func (eh *ErrorHandler) recoverFromQuotaIssue(ctx context.Context, resource coh.
 	// Update the resource with the annotation
 	if err := eh.Client.Update(ctx, latest); err != nil {
 		eh.Log.Error(err, "Failed to add quota issue annotation")
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	eh.Log.Info("Added quota issue annotation to resource",
@@ -656,7 +656,7 @@ func (eh *ErrorHandler) recoverFromQuotaIssue(ctx context.Context, resource coh.
 		"Resource quota exceeded - manual intervention may be required to increase quota or reduce resource requests")
 
 	// Return a result that requeues after a longer delay
-	return reconcile.Result{Requeue: true, RequeueAfter: 2 * time.Minute}, nil
+	return reconcile.Result{RequeueAfter: 2 * time.Minute}, nil
 }
 
 // recoverFromSchedulingIssue attempts to recover from pod scheduling issues
@@ -676,7 +676,7 @@ func (eh *ErrorHandler) recoverFromSchedulingIssue(ctx context.Context, resource
 		Namespace: resource.GetNamespace(),
 		Name:      resource.GetName(),
 	}, latest); err != nil {
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	// Add diagnostic information
@@ -692,7 +692,7 @@ func (eh *ErrorHandler) recoverFromSchedulingIssue(ctx context.Context, resource
 	// Update the resource with the annotation
 	if err := eh.Client.Update(ctx, latest); err != nil {
 		eh.Log.Error(err, "Failed to add scheduling issue annotation")
-		return reconcile.Result{Requeue: true}, err
+		return reconcile.Result{RequeueAfter: time.Minute}, err
 	}
 
 	eh.Log.Info("Added scheduling issue annotation to resource",
@@ -703,7 +703,7 @@ func (eh *ErrorHandler) recoverFromSchedulingIssue(ctx context.Context, resource
 		"Pod scheduling issue detected - manual intervention may be required to address node resources or affinity rules")
 
 	// Return a result that requeues after a longer delay
-	return reconcile.Result{Requeue: true, RequeueAfter: 2 * time.Minute}, nil
+	return reconcile.Result{RequeueAfter: 2 * time.Minute}, nil
 }
 
 // RetryOnError retries the given function with exponential backoff on error

controllers/job/job_controller.go

@@ -69,7 +69,7 @@ func (in *ReconcileJob) Reconcile(ctx context.Context, request reconcile.Request
 	// Attempt to lock the requested resource. If the resource is locked then another
 	// request for the same resource is already in progress so requeue this one.
 	if ok := in.Lock(request); !ok {
-		return reconcile.Result{Requeue: true, RequeueAfter: 0}, nil
+		return reconcile.Result{RequeueAfter: time.Second * 10}, nil
 	}
 	// Make sure that the request is unlocked when this method exits
 	defer in.Unlock(request)
@@ -190,7 +190,7 @@ func (in *ReconcileJob) createJob(ctx context.Context, deployment coh.CoherenceR
 			Reason:  "StatusQuorum",
 			Message: reason,
 		})
-		return reconcile.Result{Requeue: true, RequeueAfter: time.Second * 30}, nil
+		return reconcile.Result{RequeueAfter: time.Second * 30}, nil
 	}
 
 	err := in.Create(ctx, deployment.GetName(), storage, logger)
@@ -216,12 +216,12 @@ func (in *ReconcileJob) updateJob(ctx context.Context, deployment coh.CoherenceR
 	if !found {
 		// Desired state not found requeue and the request should sort itself out next time around
 		logger.Info("Cannot locate desired state for Job, possibly a deletion, re-queuing request")
-		return reconcile.Result{Requeue: true}, nil
+		return reconcile.Result{RequeueAfter: time.Minute}, nil
 	}
 	if resource.IsDelete() {
 		// we should never get here, requeue and the request should sort itself out next time around
 		logger.Info("In update path for Job, but is a deletion - re-queuing request")
-		return reconcile.Result{Requeue: true}, nil
+		return reconcile.Result{RequeueAfter: time.Minute}, nil
 	}
 
 	desired := resource.Spec.(*batchv1.Job)
@@ -254,7 +254,7 @@ func (in *ReconcileJob) patchJob(ctx context.Context, deployment coh.CoherenceRe
 		msg := fmt.Sprintf("upddates to the job would have been invalid, the update will not be re-queued: %v", errorList)
 		events := in.GetEventRecorder()
 		events.Event(deployment, corev1.EventTypeWarning, reconciler.EventReasonUpdated, msg)
-		return reconcile.Result{Requeue: false}, errors.New(msg)
+		return reconcile.Result{}, errors.New(msg)
 	}
 
 	// copy the job, so we do not alter the passed in job
@@ -326,7 +326,7 @@ func (in *ReconcileJob) patchJob(ctx context.Context, deployment coh.CoherenceRe
 		logger.Info("Error patching Job " + err.Error())
 		return in.HandleErrAndRequeue(ctx, err, deployment, fmt.Sprintf(FailedToPatchMessage, deployment.GetName(), err.Error()), logger)
 	case !patched:
-		return reconcile.Result{Requeue: true}, nil
+		return reconcile.Result{RequeueAfter: time.Minute}, nil
 	}
 
 	return reconcile.Result{}, nil

controllers/reconciler/base_controller.go

@@ -449,7 +449,7 @@ func isOperationError(err error) bool {
 func (in *CommonReconciler) HandleErrAndFinish(ctx context.Context, err error, deployment *coh.Coherence, msg string, logger logr.Logger) (reconcile.Result, error) {
 	if err == nil {
 		logger.V(0).Info(msg)
-		return reconcile.Result{Requeue: false}, nil
+		return reconcile.Result{}, nil
 	}
 
 	// Add caller information to the error if it's not already an OperationError
@@ -481,7 +481,7 @@ func (in *CommonReconciler) HandleErrAndFinish(ctx context.Context, err error, d
 			WithContext("reason", "permanent")
 	}
 
-	return reconcile.Result{Requeue: false}, nil
+	return reconcile.Result{}, nil
 }
 
 // Failed is a common error handler (deprecated, use HandleErrAndRequeue instead)
@@ -514,7 +514,7 @@ func (in *CommonReconciler) Failed(ctx context.Context, err error, deployment co
 		}
 	}
 
-	return reconcile.Result{Requeue: requeue}, err
+	return reconcile.Result{}, err
 }
 
 // getErrorHandler returns an error handler for this reconciler

controllers/reconciler/simple_reconciler.go

@@ -8,6 +8,8 @@ package reconciler
 
 import (
 	"context"
+	"time"
+
 	coh "github.com/oracle/coherence-operator/api/v1"
 	"github.com/oracle/coherence-operator/pkg/clients"
 	corev1 "k8s.io/api/core/v1"
@@ -65,7 +67,7 @@ func (in *SimpleReconciler) Reconcile(ctx context.Context, request reconcile.Req
 	// request for the same resource is already in progress so requeue this one.
 	if ok := in.Lock(request); !ok {
 		logger.Info("Completed reconcile. Already locked, re-queuing")
-		return reconcile.Result{Requeue: true, RequeueAfter: 0}, nil
+		return reconcile.Result{RequeueAfter: time.Second * 10}, nil
 	}
 	// Make sure that the request is unlocked when this method exits
 	defer in.Unlock(request)

controllers/secret/secret_controller.go

@@ -8,6 +8,8 @@ package secret
 
 import (
 	"context"
+	"time"
+
 	coh "github.com/oracle/coherence-operator/api/v1"
 	"github.com/oracle/coherence-operator/controllers/reconciler"
 	"github.com/oracle/coherence-operator/pkg/clients"
@@ -70,7 +72,7 @@ func (in *ReconcileSecret) Reconcile(ctx context.Context, request reconcile.Requ
 	// request for the same resource is already in progress so requeue this one.
 	if ok := in.Lock(request); !ok {
 		logger.Info("Completed reconcile. Already locked, re-queuing")
-		return reconcile.Result{Requeue: true, RequeueAfter: 0}, nil
+		return reconcile.Result{RequeueAfter: time.Second * 10}, nil
 	}
 	// Make sure that the request is unlocked when this method exits
 	defer in.Unlock(request)

controllers/servicemonitor/servicemonitor_controller.go

@@ -9,6 +9,8 @@ package servicemonitor
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/go-logr/logr"
 	coh "github.com/oracle/coherence-operator/api/v1"
 	"github.com/oracle/coherence-operator/controllers/reconciler"
@@ -69,7 +71,7 @@ func (in *ReconcileServiceMonitor) Reconcile(ctx context.Context, request reconc
 	// Attempt to lock the requested resource. If the resource is locked then another
 	// request for the same resource is already in progress so requeue this one.
 	if ok := in.Lock(request); !ok {
-		return reconcile.Result{Requeue: true, RequeueAfter: 0}, nil
+		return reconcile.Result{RequeueAfter: time.Second * 10}, nil
 	}
 	// Make sure that the request is unlocked when this method exits
 	defer in.Unlock(request)