Use merge patch instead of Update method in test harness. #606
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
jbarrick-mesosphere
requested review from
kensipe,
gkleiman,
alenkacz,
gerred,
runyontr and
fabianbaier
|
It's not clear to me what benefit using strategic merge has over regular merge. |
fabianbaier
approved these changes
Jul 19, 2019
jbarrick-mesosphere
force-pushed
the
test-patching
branch
from
f9c8e73
to
c3c2749
Compare
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 bug
What this PR does / why we need it:
This fixes the test harness to use a merge patch instead of
Update. In our previous use ofUpdate, we were replacing entire objects when updating them (e.g., ifstatusis not defined in YAML it would get wiped out on update). Instead of usingUpdate, we use the merge patching method.We do not use strategic merge patch as it does not work with CRDs and my tests indicate the proper behavior that we want is achieved using only merge patch.
Additionally, as a side effect of this change, only minimal updates need to be defined in test steps.
If validated well, this can guide the implementation of
CreateOrUpdatein KUDO (or be the implementation ofCreateOrUpdate).Does this PR introduce a user-facing change?: