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

UPSTREAM: 66725: update exit code to 0 if patch not needed #20456

Conversation

juanvallejo
Copy link
Contributor

@juanvallejo juanvallejo commented Jul 27, 2018

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

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 27, 2018
@soltysh soltysh self-assigned this Jul 30, 2018
@soltysh
Copy link
Contributor

soltysh commented Jul 30, 2018

/hold
let's wait until upstream PR gets comments addressed and tagged for merg and then feel free to unhold this one.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 30, 2018
@soltysh
Copy link
Contributor

soltysh commented Jul 31, 2018

Don't forget to add the test like the one you've added upstream.

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 31, 2018
@juanvallejo
Copy link
Contributor Author

@soltysh thanks, added Origin tests. Updated upstream PR as well

Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@soltysh
Copy link
Contributor

soltysh commented Aug 1, 2018

/hold cancel

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Aug 1, 2018
@soltysh soltysh added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 1, 2018
@openshift-ci-robot
Copy link

[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

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit c83ba6c into openshift:master Aug 1, 2018
@juanvallejo juanvallejo deleted the jvallejo/update-patch-return-code-logic branch August 1, 2018 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants