translate machine-pool-ci-version KubeadmConfig merge patch to JSON patch #5225
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
k8s-ci-robot
added
release-note-none
|
/assign @nawazkh |
k8s-ci-robot
added
the
size/L
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #5225 +/- ##
=======================================
Coverage 52.78% 52.79%
=======================================
Files 270 270
Lines 29043 29043
=======================================
+ Hits 15330 15332 +2
+ Misses 12922 12920 -2
Partials 791 791 ☔ View full report in Codecov by Sentry. |
nojnhuh
force-pushed
the
prow-mp-ci-version-patch
branch
from
385abd5 to
04bc24a
Compare
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: 6c95e9d0aafbe1459534d03dd292ce25dfc388cf
|
|
/retest |
1 similar comment
|
/retest |
k8s-ci-robot
added
the
approved
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mboersma, nojnhuh The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest |
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.
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
This PR moves the changes to the
preKubeadmCommandsandfilesarrays in the KubeadmConfig used for MachinePool ci-version tests out of a strategic merge patch and into a JSON merge patch. Using a JSON merge patch allows us to express "add this element to this array" vs. a strategic merge patch that can only express "replace the entire array with these elements listed here." This should help us integrate the ILB changes from #5209 with the ci-version templates which both require changes to these arrays. The rendered templates remain exactly the same with these changes.Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #
Special notes for your reviewer:
TODOs:
Release note: