UPSTREAM: 66725: update exit code to 0 if patch not needed#20456
Merged
openshift-merge-robot merged 2 commits intoopenshift:masterfrom Aug 1, 2018
Merged
Conversation
openshift-ci-robot
added
the
size/XS
Contributor
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
Contributor
|
Don't forget to add the test like the one you've added upstream. |
openshift-ci-robot
added
size/S
Contributor
Author
|
@soltysh thanks, added Origin tests. Updated upstream PR as well |
Contributor
|
/hold cancel |
openshift-ci-robot
added
lgtm
soltysh
added
the
approved
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: juanvallejo, soltysh The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
|
/retest Please review the full test history for this PR and help us cut down flakes. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 specific logic in the patch command that exited with code 1, was only doing so when there was no diff between an existing object and its patched counterpart. (In case of errors, we just return those, which eventually ends up exiting with code 1 anyway). This patch removes this block, as we should not be treating patch no-ops as errors.
Fixes kubernetes/kubernetes#58212
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1609179
UPSTREAM: kubernetes/kubernetes#66725
cc @soltysh