fix: just requeue all conflict errors#4758
Merged
negz merged 1 commit intocrossplane:masterfrom Oct 12, 2023
Merged
Conversation
Signed-off-by: Philippe Scorsolini <p.scorsolini@gmail.com>
sttts
approved these changes
Oct 9, 2023
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.
Description of your changes
Fixes #2114.
I went through all the Reconcilers looking at all the places we were emitting warning events on errors and checked whether the error could come from an update of a resource, if so added a check similar to what we already did for crossplane/crossplane-runtime#540.
Took the chance to rename all aliased imports from "apierrors" to "kerrors" as the latter was the prevalent name on master already.
I have:
Added or updated unit and E2E tests for my change.make reviewableto ensure this PR is ready for review.Addedbackport release-x.ylabels to auto-backport this PR, if necessary.Opened a PR updating the docs, if necessary.