Skip to content

Commit

Permalink
Merge pull request #16082 from juanvallejo/jvallejo/ensure-unstructur…
Browse files Browse the repository at this point in the history
…ed-objects-before-composing

Automatic merge from submit-queue

UPSTREAM: 51727: ensure oc get deals with unstructured resources

Fixes #16064
Addresses BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1487245

`$ oc get ...` assumed all resources returned from a resource builder were unstructured objects.
This patch ensures we are dealing with unstructured objects before attempting to
compose into an unstructured list.

cc @openshift/cli-review @enj
  • Loading branch information
openshift-merge-robot committed Sep 9, 2017
2 parents 994a5a6 + 6974922 commit 4c6b2eb
Showing 1 changed file with 25 additions and 8 deletions.
33 changes: 25 additions & 8 deletions vendor/k8s.io/kubernetes/pkg/kubectl/cmd/get.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4c6b2eb

Please sign in to comment.