Skip to content

More test failures with latest release #653

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

Open
annismckenzie wants to merge 2 commits into
base: main
Choose a base branch
from
Open

More test failures with latest release #653

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
00e5820
Respect a requeue after if it’s set in case the error wraps `ErrQuiet`
annismckenzie Sep 26, 2025
662d869
Honor the requeue after in the ResourceReconciler after updating the …
annismckenzie Sep 26, 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
9 changes: 8 additions & 1 deletion reconcilers/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,9 @@ func (r *ResourceReconciler[T]) Reconcile(ctx context.Context, req Request) (Res
result, err := r.AfterReconcile(ctx, req, AggregateResults(beforeResult, reconcileResult), err)
if errors.Is(err, ErrQuiet) {
// suppress error, while forcing a requeue
if result.RequeueAfter > 0 { // honor requeue after returned by reconciler
Copy link
Contributor Author

@annismckenzie annismckenzie Sep 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be okay to add.

Copy link
Contributor Author

@annismckenzie annismckenzie Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a use case below and I really think this is worth to add.

return result, nil
}
return Result{Requeue: true}, nil
}
return result, err
Expand Down Expand Up @@ -381,7 +384,11 @@ func (r *ResourceReconciler[T]) reconcileOuter(ctx context.Context, req Request)
}

// Suppress result. Let the informer discover the resource mutation and requeue. Requeueing
// now may result in re-processing a stale cache.
// now may result in re-processing a stale cache. Honor the requeue after if it was set.
if result.RequeueAfter > 0 {
return result, nil
}

return Result{}, nil
}

Expand Down
5 changes: 4 additions & 1 deletion reconcilers/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ func TestResourceReconciler(t *testing.T) {
resource.Status.Fields = map[string]string{}
}
resource.Status.Fields["Reconciler"] = "ran"
// the result is ignored because the status is updated
// the result is honored
return reconcilers.Result{RequeueAfter: 10}, nil
},
}
Expand All @@ -974,6 +974,9 @@ func TestResourceReconciler(t *testing.T) {
rtesting.NewEvent(givenResource, scheme, corev1.EventTypeNormal, "StatusUpdated",
`Updated status`),
},
ExpectedResult: reconcile.Result{
RequeueAfter: 10,
},
ExpectStatusUpdates: []client.Object{
givenResource.StatusDie(func(d *dies.TestResourceStatusDie) {
d.AddField("Reconciler", "ran")
Expand Down
Loading