diff --git a/controllers/coherence_controller.go b/controllers/coherence_controller.go index 17995a2d..ebee2779 100644 --- a/controllers/coherence_controller.go +++ b/controllers/coherence_controller.go @@ -38,6 +38,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" "strconv" + "time" ) const ( @@ -293,7 +294,8 @@ func (in *CoherenceReconciler) Reconcile(ctx context.Context, request ctrl.Reque r, err := rec.ReconcileAllResourceOfKind(ctx, request, deployment, storage) if err != nil { failures = append(failures, Failure{Name: rec.GetControllerName(), Error: err}) - } else if r.RequeueAfter == 0 { + result.RequeueAfter = time.Minute + } else if r.RequeueAfter > 0 && (result.RequeueAfter <= 0 || r.RequeueAfter < result.RequeueAfter) { result.RequeueAfter = r.RequeueAfter } } diff --git a/controllers/coherencejob_controller.go b/controllers/coherencejob_controller.go index 75b6557f..cc3672b8 100644 --- a/controllers/coherencejob_controller.go +++ b/controllers/coherencejob_controller.go @@ -30,6 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" "strconv" + "time" coh "github.com/oracle/coherence-operator/api/v1" ) @@ -208,13 +209,9 @@ func (in *CoherenceJobReconciler) ReconcileDeployment(ctx context.Context, reque r, err := rec.ReconcileAllResourceOfKind(ctx, request, deployment, storage) if err != nil { failures = append(failures, Failure{Name: rec.GetControllerName(), Error: err}) - } - if r.RequeueAfter != 0 { - if result.RequeueAfter <= 0 { - result.RequeueAfter = r.RequeueAfter - } else { - result.RequeueAfter = min(result.RequeueAfter, r.RequeueAfter) - } + result.RequeueAfter = time.Minute + } else if r.RequeueAfter > 0 && (result.RequeueAfter <= 0 || r.RequeueAfter < result.RequeueAfter) { + result.RequeueAfter = r.RequeueAfter } }