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: 59506: fix watch on multiple reqs #18514

Conversation

juanvallejo
Copy link
Contributor

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537789

oc get <resource> --watch only supports watching a single resource kind at a time.
This check fails if more than one resource Info is returned.

When dealing with large quantities of a single resource kind, or an amount that exceeds the value of --chunk-size, more than one request is made to the server causing a resource Info to be created for each of the requests, ultimately causing the above check to fail even though we are dealing with the same type of resource.

This patch modifies that check to take into account the GVKs of all infos returned, and only fail if at least one differs.

cc @deads2k @jeremyeder

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 7, 2018
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Feb 7, 2018
@mfojtik
Copy link
Contributor

mfojtik commented Feb 8, 2018

/retest

1 similar comment
@mfojtik
Copy link
Contributor

mfojtik commented Feb 8, 2018

/retest

@juanvallejo juanvallejo force-pushed the jvallejo/handle-watch-multiple-reqs branch from 81bb300 to 76b38bb Compare February 12, 2018 15:06
@juanvallejo
Copy link
Contributor Author

@mfojtik @deads2k PR up to date with upstream. ptal

@juanvallejo juanvallejo force-pushed the jvallejo/handle-watch-multiple-reqs branch 2 times, most recently from e0a6d6f to d2adfee Compare February 12, 2018 20:45
@juanvallejo juanvallejo force-pushed the jvallejo/handle-watch-multiple-reqs branch from d2adfee to b02c1e6 Compare February 12, 2018 20:46
Copy link
Member

@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

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2018
@juanvallejo juanvallejo force-pushed the jvallejo/handle-watch-multiple-reqs branch from b02c1e6 to 170d39f Compare February 12, 2018 20:50
@soltysh soltysh added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 12, 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.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 48d2a6d into openshift:master Feb 12, 2018
@juanvallejo juanvallejo deleted the jvallejo/handle-watch-multiple-reqs branch February 13, 2018 15:10
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. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants