Silence conflicts on status update for ResourceReconciler#664
Merged
scothis merged 2 commits intoreconcilerio:mainfrom Dec 17, 2025
Merged
Silence conflicts on status update for ResourceReconciler#664scothis merged 2 commits intoreconcilerio:mainfrom
scothis merged 2 commits intoreconcilerio:mainfrom
Conversation
Conflict errors on status update are often benign and can only be recovered by reprocessing the resource. As errors the can produce a noisy log that distracts from more significant errors. Because a high volume of status updates is indicative of a problem, an info log line is captured instead of the full error. The StatusUpdateFailed event is no longer recorded for conflicts. Signed-off-by: Scott Andrews <scott@andrews.me>
Member
Author
|
@pmalek can you give this a try? |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #664 +/- ##
==========================================
+ Coverage 59.57% 59.96% +0.38%
==========================================
Files 39 39
Lines 4510 3559 -951
==========================================
- Hits 2687 2134 -553
+ Misses 1713 1315 -398
Partials 110 110 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
mamachanko
approved these changes
Dec 5, 2025
pmalek
reviewed
Dec 14, 2025
Contributor
pmalek
left a comment
There was a problem hiding this comment.
One nit, I believe this is a good fix for the issue at hand.
Not sure if we'd need to customize this going forward but an improvement nonetheless. Thanks!
Signed-off-by: Scott Andrews <scott@andrews.me> Co-authored-by: Patryk Małek <pmalek@users.noreply.github.com> Signed-off-by: Scott Andrews <scott@andrews.me>
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
3 participants
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.
Conflict errors on status update are often benign and can only be recovered by reprocessing the resource. As errors the can produce a noisy log that distracts from more significant errors.
Because a high volume of status updates is indicative of a problem, an info log line is captured instead of the full error. The StatusUpdateFailed event is no longer recorded for conflicts.
Resolves #663