fix: address a SSA related issue which might cause all apply attempts (except the first one) to fail due to conflicts #59
Conversation
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
Signed-off-by: michaelawyu <chenyu1@microsoft.com>
Arvindthiru
reviewed
May 8, 2025
Arvindthiru
reviewed
May 8, 2025
Signed-off-by: michaelawyu <chenyu1@microsoft.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅ 📢 Thoughts on this report? Let us know! |
ryanzhang-oss
previously approved these changes
May 8, 2025
Signed-off-by: michaelawyu <chenyu1@microsoft.com>
ryanzhang-oss
approved these changes
May 15, 2025
audrastump
pushed a commit
to audrastump/kubefleet
that referenced
this pull request
Aug 20, 2025
… (except the first one) to fail due to conflicts (kubefleet-dev#59)
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
This PR fixes an issue in Fleet where apply attempts might fail to due field manager conflicts when SSA (server-side apply) is used; the user will see their first apply op successfully, but any field change later cannot be applied.
Note that this bug exists in both the new and the old work applier; only the new work applier receives the fix.
I have:
make reviewableto ensure this PR is ready for review.How has this code been tested
Special notes for your reviewer
A few additional E2E test cases will be sent as separate PRs.