From aa371309f6d3158ab267c5f3f50d52d3a5a98731 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 5 Jun 2025 11:12:33 +0200 Subject: [PATCH 1/2] Fix requeue bug --- internal/controller/federatedmanagedmetric_controller.go | 2 -- internal/controller/federatedmetric_controller.go | 2 -- internal/controller/managedmetric_controller.go | 2 -- internal/controller/metric_controller.go | 2 -- internal/controller/metric_controller_test.go | 1 - 5 files changed, 9 deletions(-) diff --git a/internal/controller/federatedmanagedmetric_controller.go b/internal/controller/federatedmanagedmetric_controller.go index 6de552c..33a0bfb 100644 --- a/internal/controller/federatedmanagedmetric_controller.go +++ b/internal/controller/federatedmanagedmetric_controller.go @@ -89,7 +89,6 @@ func (r *FederatedManagedMetricReconciler) scheduleNextReconciliation(metric *v1 elapsed := time.Since(metric.Status.LastReconcileTime.Time) return ctrl.Result{ - Requeue: true, RequeueAfter: metric.Spec.Interval.Duration - elapsed, }, nil } @@ -241,7 +240,6 @@ func (r *FederatedManagedMetricReconciler) Reconcile(ctx context.Context, req ct l.Info(fmt.Sprintf("federated managed metric '%s' re-queued for execution in %v\n", metric.Spec.Name, requeueTime)) return ctrl.Result{ - Requeue: true, RequeueAfter: requeueTime, }, nil } diff --git a/internal/controller/federatedmetric_controller.go b/internal/controller/federatedmetric_controller.go index fbc2dce..84023ae 100644 --- a/internal/controller/federatedmetric_controller.go +++ b/internal/controller/federatedmetric_controller.go @@ -90,7 +90,6 @@ func scheduleNextReconciliation(metric *v1alpha1.FederatedMetric) (ctrl.Result, elapsed := time.Since(metric.Status.LastReconcileTime.Time) return ctrl.Result{ - Requeue: true, RequeueAfter: metric.Spec.Interval.Duration - elapsed, }, nil } @@ -243,7 +242,6 @@ func (r *FederatedMetricReconciler) Reconcile(ctx context.Context, req ctrl.Requ l.Info(fmt.Sprintf("federated metric '%s' re-queued for execution in %v\n", metric.Spec.Name, requeueTime)) return ctrl.Result{ - Requeue: true, RequeueAfter: requeueTime, }, nil } diff --git a/internal/controller/managedmetric_controller.go b/internal/controller/managedmetric_controller.go index 6702b6f..cd23ea9 100644 --- a/internal/controller/managedmetric_controller.go +++ b/internal/controller/managedmetric_controller.go @@ -64,7 +64,6 @@ func (r *ManagedMetricReconciler) getRestConfig() *rest.Config { func (r *ManagedMetricReconciler) scheduleNextReconciliation(metric *v1alpha1.ManagedMetric) (ctrl.Result, error) { elapsed := time.Since(metric.Status.Observation.Timestamp.Time) return ctrl.Result{ - Requeue: true, RequeueAfter: metric.Spec.Interval.Duration - elapsed, }, nil } @@ -262,7 +261,6 @@ func (r *ManagedMetricReconciler) Reconcile(ctx context.Context, req ctrl.Reques l.Info(fmt.Sprintf("managed metric '%s' re-queued for execution in %v\n", metric.Spec.Name, requeueTime)) return ctrl.Result{ - Requeue: true, RequeueAfter: requeueTime, }, nil } diff --git a/internal/controller/metric_controller.go b/internal/controller/metric_controller.go index f18f293..4bd5dd4 100644 --- a/internal/controller/metric_controller.go +++ b/internal/controller/metric_controller.go @@ -85,7 +85,6 @@ func (r *MetricReconciler) scheduleNextReconciliation(metric *v1alpha1.Metric) ( elapsed := time.Since(metric.Status.Observation.Timestamp.Time) return ctrl.Result{ - Requeue: true, RequeueAfter: metric.Spec.Interval.Duration - elapsed, }, nil } @@ -267,7 +266,6 @@ func (r *MetricReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr l.Info(fmt.Sprintf("metric '%s' re-queued for execution in %v\n", metric.Spec.Name, requeueTime)) return ctrl.Result{ - Requeue: true, RequeueAfter: requeueTime, }, nil } diff --git a/internal/controller/metric_controller_test.go b/internal/controller/metric_controller_test.go index 25d4743..ca60299 100644 --- a/internal/controller/metric_controller_test.go +++ b/internal/controller/metric_controller_test.go @@ -123,7 +123,6 @@ func (r *TestMetricReconciler) Reconcile(ctx context.Context, req ctrl.Request) // Requeue return ctrl.Result{ - Requeue: true, RequeueAfter: metric.Spec.Interval.Duration, }, nil } From d88a0dad98e076c52da2b76e4b5680796853a028 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 5 Jun 2025 11:33:02 +0200 Subject: [PATCH 2/2] fix test --- internal/controller/metric_controller_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/controller/metric_controller_test.go b/internal/controller/metric_controller_test.go index ca60299..0f954a2 100644 --- a/internal/controller/metric_controller_test.go +++ b/internal/controller/metric_controller_test.go @@ -341,7 +341,6 @@ func testReconcileMetricHappyPath(t *testing.T) { // Verify the result require.NoError(t, err) - require.True(t, result.Requeue) require.Equal(t, 5*time.Minute, result.RequeueAfter) // Verify the Metric status was updated correctly