-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
[release-1.12 CP] Issue #6728: support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers #7049
[release-1.12 CP] Issue #6728: support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers #7049
Conversation
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## release-1.12 #7049 +/- ##
================================================
- Coverage 60.64% 60.61% -0.03%
================================================
Files 247 250 +3
Lines 26527 26683 +156
================================================
+ Hits 16087 16175 +88
- Misses 9314 9367 +53
- Partials 1126 1141 +15 ☔ View full report in Codecov by Sentry. |
@27149chen I am not sure if we should take a big change now to 1.12 |
support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers Signed-off-by: lou <[email protected]>
d439f39
to
d7b4b0a
Compare
Signed-off-by: lou <[email protected]>
@27149chen You need to rebase the commit to resolve |
1 small nitpick - we missed making the PR title reflect the cherry picked feature. |
@anshulahuja98 what's the correct title for cherry-pick prs? |
Should have ideally included the original PR naming |
cherry-pick #6917 to release 1.12: support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers
Thank you for contributing to Velero!
Please add a summary of your change
Does your change fix a particular issue?
Fixes #(issue)
Please indicate you've done the following:
/kind changelog-not-required
as a comment on this pull request.site/content/docs/main
.