Skip to content

Commit

Permalink
Merge pull request #17023 from juanvallejo/jvallejo/pick-upstream-51750
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 16885, 17023).

UPSTREAM: 51750: output `<none>` for colums not found

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

Picks changes introduced in kubernetes/kubernetes#51750
to allow the custom-columns to succeed / print all known column values even when
an object's field does not exist.

**Before**
```
$ oc get dc mydc -o custom-columns=NAME:.metadata.name,UNKNOWN:.metadata.unknown
error: unknown is not found
```

**After**
```
$ oc get dc mydc -o custom-columns=NAME:.metadata.name,UNKNOWN:.metadata.unknown
NAME      UNKNOWN
mydc      <none>
```

cc @openshift/cli-review
  • Loading branch information
openshift-merge-robot committed Oct 25, 2017
2 parents f1f5221 + ec02f7b commit d29dd8e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
6 changes: 3 additions & 3 deletions vendor/k8s.io/kubernetes/pkg/printers/customcolumn.go

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

20 changes: 20 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/printers/customcolumn_test.go

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

0 comments on commit d29dd8e

Please sign in to comment.