Switch to structured merge diff #272
Merged
Conversation
This file contains 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
added 12 commits
January 21, 2025 23:26
jveski
commented
Jan 22, 2025
jveski
commented
Jan 22, 2025
jveski
commented
Jan 22, 2025
jveski
commented
Jan 22, 2025
jveski
commented
Jan 22, 2025
jveski
changed the title
jveski
changed the title
tilnl
approved these changes
Jan 22, 2025
AYM1607
reviewed
Jan 22, 2025
AYM1607
reviewed
Jan 22, 2025
AYM1607
reviewed
Jan 22, 2025
AYM1607
reviewed
Jan 22, 2025
AYM1607
reviewed
Jan 22, 2025
AYM1607
reviewed
Jan 22, 2025
AYM1607
approved these changes
Jan 22, 2025
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.
The new structured merge diff libraries used by apiserver server-side apply are a nicer solution to strategic merge patch than the old approach. They expose the diff and allow callers to modify it before applying, which will enable partial reconciliation in the future (a very important feature for Eno).
Adopting structured merge diff also has the benefit of removing the
mungeDifffunction which has caused us much grief historically. It will immediately solve one known bug: removing properties doesn't currently work correctly.