Skip to content

fix: requeue bug #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 5, 2025
Merged

fix: requeue bug #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa37130
Fix requeue bug
moelsayed Jun 5, 2025
d88a0da
fix test
moelsayed Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions internal/controller/federatedmanagedmetric_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions internal/controller/federatedmetric_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions internal/controller/managedmetric_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions internal/controller/metric_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions internal/controller/metric_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -342,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
Expand Down
Loading