Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proposal to support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers #6797

Merged
merged 6 commits into from
Oct 4, 2023

Conversation

27149chen
Copy link
Contributor

@27149chen 27149chen commented Sep 8, 2023

Please add a summary of your change

Proposal to support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers

Does your change fix a particular issue?

Fixes #6728

Please indicate you've done the following:

  • Accepted the DCO. Commits without the DCO will delay acceptance.
  • Created a changelog file or added /kind changelog-not-required as a comment on this pull request.
  • Updated the corresponding documentation in site/content/docs/main.

@codecov
Copy link

codecov bot commented Sep 8, 2023

Codecov Report

Merging #6797 (21a76c4) into main (246831d) will increase coverage by 0.32%.
Report is 32 commits behind head on main.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #6797      +/-   ##
==========================================
+ Coverage   60.45%   60.78%   +0.32%     
==========================================
  Files         242      245       +3     
  Lines       26031    26255     +224     
==========================================
+ Hits        15738    15960     +222     
+ Misses       9187     9164      -23     
- Partials     1106     1131      +25     

see 13 files with indirect coverage changes

@anshulahuja98 anshulahuja98 self-requested a review September 11, 2023 07:52
@anshulahuja98 anshulahuja98 added the 1.13-candidate issue/pr that should be considered to target v1.13 minor release label Sep 12, 2023
@reasonerjt reasonerjt removed the 1.13-candidate issue/pr that should be considered to target v1.13 minor release label Sep 20, 2023
@reasonerjt reasonerjt added this to the v1.13 milestone Sep 20, 2023
@27149chen 27149chen force-pushed the rm-improvement-design branch from df0aeed to 21a76c4 Compare September 22, 2023 09:07
No security impact.

## Compatibility
Compatible with current Resource Modifiers.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe also mention about the compatibility with the existing RestoreItemAction plugins

@anshulahuja98 anshulahuja98 merged commit 7f73aca into vmware-tanzu:main Oct 4, 2023
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Resource Modifier should support json merge patch and strategic merge patch
5 participants