From b3e0543b0e1c8dc74787f2055bed9ed79af8502b Mon Sep 17 00:00:00 2001 From: odubajDT Date: Thu, 27 Oct 2022 15:13:30 +0200 Subject: [PATCH] speed improvements Signed-off-by: odubajDT --- operator/controllers/common/phasehandler.go | 2 +- operator/controllers/keptnappversion/controller.go | 2 +- operator/controllers/keptnevaluation/controller.go | 4 ++-- operator/controllers/keptnworkloadinstance/controller.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/operator/controllers/common/phasehandler.go b/operator/controllers/common/phasehandler.go index 2dab84010b8..39c0b317bc4 100644 --- a/operator/controllers/common/phasehandler.go +++ b/operator/controllers/common/phasehandler.go @@ -34,7 +34,7 @@ func (r PhaseHandler) HandlePhase(ctx context.Context, ctxAppTrace context.Conte requeueResult := ctrl.Result{Requeue: true, RequeueAfter: 5 * time.Second} piWrapper, err := NewPhaseItemWrapperFromClientObject(reconcileObject) if err != nil { - return &PhaseResult{Continue: false, Result: requeueResult}, err + return &PhaseResult{Continue: false, Result: ctrl.Result{Requeue: true}}, err } oldStatus := piWrapper.GetState() oldPhase := piWrapper.GetCurrentPhase() diff --git a/operator/controllers/keptnappversion/controller.go b/operator/controllers/keptnappversion/controller.go index 813c74f7f18..3d4e08e5238 100644 --- a/operator/controllers/keptnappversion/controller.go +++ b/operator/controllers/keptnappversion/controller.go @@ -77,7 +77,7 @@ func (r *KeptnAppVersionReconciler) Reconcile(ctx context.Context, req ctrl.Requ appVersion := &klcv1alpha1.KeptnAppVersion{} err := r.Get(ctx, req.NamespacedName, appVersion) if errors.IsNotFound(err) { - return reconcile.Result{Requeue: true, RequeueAfter: 10 * time.Second}, nil + return reconcile.Result{}, nil } if err != nil { diff --git a/operator/controllers/keptnevaluation/controller.go b/operator/controllers/keptnevaluation/controller.go index 0bdb0826a34..bf9499ef9b9 100644 --- a/operator/controllers/keptnevaluation/controller.go +++ b/operator/controllers/keptnevaluation/controller.go @@ -83,7 +83,7 @@ func (r *KeptnEvaluationReconciler) Reconcile(ctx context.Context, req ctrl.Requ return ctrl.Result{}, nil } r.Log.Error(err, "Failed to get the KeptnEvaluation") - return ctrl.Result{Requeue: true, RequeueAfter: 30 * time.Second}, nil + return ctrl.Result{}, nil } traceContextCarrier := propagation.MapCarrier(evaluation.Annotations) @@ -114,7 +114,7 @@ func (r *KeptnEvaluationReconciler) Reconcile(ctx context.Context, req ctrl.Requ if err != nil { if errors.IsNotFound(err) { r.Log.Info(err.Error() + ", ignoring error since object must be deleted") - return ctrl.Result{Requeue: true, RequeueAfter: 30 * time.Second}, nil + return ctrl.Result{Requeue: true, RequeueAfter: 10 * time.Second}, nil } r.Log.Error(err, "Failed to retrieve a resource") return ctrl.Result{}, nil diff --git a/operator/controllers/keptnworkloadinstance/controller.go b/operator/controllers/keptnworkloadinstance/controller.go index 226ce8f630e..02b13eebbfa 100644 --- a/operator/controllers/keptnworkloadinstance/controller.go +++ b/operator/controllers/keptnworkloadinstance/controller.go @@ -83,7 +83,7 @@ func (r *KeptnWorkloadInstanceReconciler) Reconcile(ctx context.Context, req ctr workloadInstance := &klcv1alpha1.KeptnWorkloadInstance{} err := r.Get(ctx, req.NamespacedName, workloadInstance) if errors.IsNotFound(err) { - return reconcile.Result{Requeue: true, RequeueAfter: 10 * time.Second}, nil + return reconcile.Result{}, nil } if err != nil {