controller: fix requeueReconcileErr handling if it ever contains a reason - #100
Merged
Conversation
…ason Clusterpolicy controller's error handling had a potential bug that if the subcontrollers' code ever changed, the requeue handling would have reported an error. The changes have currently no functional change. Signed-off-by: Tuomas Katila <tuomas.katila@intel.com>
There was a problem hiding this comment.
Pull request overview
This PR hardens the ClusterPolicy controller’s “requeue requested by sub-controller” error handling so that errors.Is(err, requeueReconcileErr{}) reliably detects requeue sentinel errors even when they wrap a real cause, and ensures any wrapped cause can be logged without turning the reconcile into a failure.
Changes:
- Add
Is,Error, andUnwrapmethods torequeueReconcileErrto support proper sentinel matching and safe stringification when the embedded error is nil. - Introduce
logRequeueto optionally log a wrapped cause while still returningnilfrom the reconcile path. - Add unit tests covering sentinel matching,
Error,Unwrap, andlogRequeuebehavior.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| internal/controller/clusterpolicy_controller.go | Implements robust sentinel behavior for requeueReconcileErr and logs any wrapped cause during requeue paths. |
| internal/controller/clusterpolicy_controller_test.go | Adds tests validating errors.Is matching, nil-safe Error(), Unwrap(), and logRequeue() behavior. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
pfl
approved these changes
Aug 31, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Clusterpolicy controller's error handling had a potential bug that if the subcontrollers' code ever changed, the requeue handling would have reported an error.
The changes have currently no functional change.