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.

Sign up for GitHub

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

Jump to bottom

Print resource kind when oc get all outputs multiple resources of the same type #12058

Merged
merged 1 commit into from
Aug 8, 2017
Merged

Print resource kind when oc get all outputs multiple resources of the same type #12058

merged 1 commit into from
Aug 8, 2017

Conversation

juanvallejo
Copy link
Contributor

@juanvallejo juanvallejo commented Nov 29, 2016 •
edited
Loading

UPSTREAM: kubernetes/kubernetes#37636
Related comment: kubernetes/kubernetes#37533 (comment)

This patch ensures that a resource prefix is added to multiple items of
the same kind, when using oc get all. Before, a prefix was added only
when a single item was returned on oc get all, but ignored if only a
single resource kind existed but multiple items for that kind were
returned.

Example

$ oc get all
No resources found.

$ oc create service loadbalancer testsvc1 --tcp=8080
$ oc get all
NAME               CLUSTER-IP       EXTERNAL-IP                     PORT(S)    AGE
svc/testsvc1       172.30.119.220   172.46.100.155,172.46.100.155   8080/TCP   1h

$ oc create service loadbalancer testsvc2 --tcp=8081
$ oc get all
NAME               CLUSTER-IP       EXTERNAL-IP                     PORT(S)    AGE
svc/testsvc1       172.30.119.220   172.46.100.155,172.46.100.155   8080/TCP   1h
svc/testsvc2       172.30.241.197   172.46.164.158,172.46.164.158   8081/TCP   1h

@openshift/cli-review

@juanvallejo juanvallejo force-pushed the jvallejo/bugfix/print-resource-kind-when-single-resource-type branch from d2b0293 to 556bccd Compare November 29, 2016 17:27
@juanvallejo
Copy link
Contributor Author

[test]

@juanvallejo juanvallejo changed the title bugfix/print resource kind when single resource type Print resource kind when oc get all outputs multiple resources of the same type Nov 29, 2016
@juanvallejo juanvallejo force-pushed the jvallejo/bugfix/print-resource-kind-when-single-resource-type branch from 507189f to 3854b12 Compare November 30, 2016 15:56
@juanvallejo juanvallejo mentioned this pull request Dec 1, 2016
Merged
@juanvallejo juanvallejo force-pushed the jvallejo/bugfix/print-resource-kind-when-single-resource-type branch from cb27bff to 7d2d84c Compare December 1, 2016 17:13
@juanvallejo
Copy link
Contributor Author

juanvallejo commented Dec 1, 2016 •
edited
Loading

conformance check flaked on #10162 re[test]

@juanvallejo
Copy link
Contributor Author

conformance flake #9379 re[test]

@juanvallejo
Copy link
Contributor Author

@fabianofranz Upstream merged! kubernetes/kubernetes#37636 PTAL

@fabianofranz
Copy link
Member

@juanvallejo Thanks! Needs a squash.

@juanvallejo juanvallejo force-pushed the jvallejo/bugfix/print-resource-kind-when-single-resource-type branch 2 times, most recently from 13dc4c2 to bd58514 Compare December 10, 2016 00:07
@juanvallejo
Copy link
Contributor Author

@fabianofranz

Thanks! Needs a squash.

Done!

@fabianofranz fabianofranz added this to the 1.6.0 milestone Dec 12, 2016
@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 1, 2017
@openshift-bot openshift-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 15, 2017
@openshift-bot openshift-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 24, 2017
@juanvallejo juanvallejo force-pushed the jvallejo/bugfix/print-resource-kind-when-single-resource-type branch from bd58514 to e7cfd54 Compare June 13, 2017 22:09
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 13, 2017
@juanvallejo
Copy link
Contributor Author

flaked on #13271 re[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to e7cfd54

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2215/) (Base Commit: c7a38d7)

@juanvallejo
Copy link
Contributor Author

cc @fabianofranz

@fabianofranz
Copy link
Member

[merge]

@sosiouxme
Copy link
Member

This is gonna fail unless you add priority: bug to it... and I'm not sure it's a bug?

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/1011/) (Base Commit: ba69e24) (PR Branch Commit: e7cfd54)

@liggitt liggitt removed this from the 3.6.0 milestone Jun 21, 2017
@openshift-merge-robot openshift-merge-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 24, 2017
@fabianofranz
Copy link
Member

[merge]

@openshift-merge-robot openshift-merge-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 28, 2017
@fabianofranz
Copy link
Member

/lgtm
/approve no-issue

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 31, 2017
@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 31, 2017
@stevekuznetsov
Copy link
Contributor

/test end_to_end

@0xmichalis
Copy link
Contributor

/retest

@juanvallejo juanvallejo force-pushed the jvallejo/bugfix/print-resource-kind-when-single-resource-type branch from e7cfd54 to aabafb4 Compare August 4, 2017 14:07
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 4, 2017
@juanvallejo
Copy link
Contributor Author

/test extended_templates

@stevekuznetsov
Copy link
Contributor

@juanvallejo is this supposed to only contain the test?

@juanvallejo
Copy link
Contributor Author

@stevekuznetsov

is this supposed to only contain the test?

Yeah, any non-test changes were brought in during the last rebase

@stevekuznetsov
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabianofranz, juanvallejo, stevekuznetsov

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-bot
Copy link
Contributor

/retest

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

@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 2e29974 into openshift:master Aug 8, 2017
@juanvallejo juanvallejo deleted the jvallejo/bugfix/print-resource-kind-when-single-resource-type branch August 8, 2017 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@fabianofranz fabianofranz

@liggitt liggitt

@stevekuznetsov stevekuznetsov

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/cli kind/post-rebase 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@juanvallejo @fabianofranz @openshift-bot @sosiouxme @stevekuznetsov @0xmichalis @openshift-merge-robot @liggitt @openshift-ci-robot