@@ -8906,6 +8906,8 @@ _oc_env()

     local_nonpersistent_flags+=("--from=")

     flags+=("--list")

     local_nonpersistent_flags+=("--list")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -8922,6 +8924,17 @@ _oc_env()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--as=")

     flags+=("--certificate-authority=")

     flags_with_completion+=("--certificate-authority")

@@ -13423,6 +13436,8 @@ _oc_set_env()

     local_nonpersistent_flags+=("--from=")

     flags+=("--list")

     local_nonpersistent_flags+=("--list")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -13439,6 +13454,17 @@ _oc_set_env()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--as=")

     flags+=("--certificate-authority=")

     flags_with_completion+=("--certificate-authority")

@@ -13862,6 +13888,8 @@ _oc_set_volumes()

     local_nonpersistent_flags+=("--mount-path=")

     flags+=("--name=")

     local_nonpersistent_flags+=("--name=")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -13878,8 +13906,19 @@ _oc_set_volumes()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

     flags+=("--source=")

     local_nonpersistent_flags+=("--source=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--type=")

     two_word_flags+=("-t")

     local_nonpersistent_flags+=("--type=")

@@ -14275,6 +14314,8 @@ _oc_volumes()

     local_nonpersistent_flags+=("--mount-path=")

     flags+=("--name=")

     local_nonpersistent_flags+=("--name=")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -14291,8 +14332,19 @@ _oc_volumes()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

     flags+=("--source=")

     local_nonpersistent_flags+=("--source=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--type=")

     two_word_flags+=("-t")

     local_nonpersistent_flags+=("--type=")

@@ -13514,6 +13514,8 @@ _openshift_cli_env()

     local_nonpersistent_flags+=("--from=")

     flags+=("--list")

     local_nonpersistent_flags+=("--list")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -13530,6 +13532,17 @@ _openshift_cli_env()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--as=")

     flags+=("--certificate-authority=")

     flags_with_completion+=("--certificate-authority")

@@ -18096,6 +18109,8 @@ _openshift_cli_set_env()

     local_nonpersistent_flags+=("--from=")

     flags+=("--list")

     local_nonpersistent_flags+=("--list")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -18112,6 +18127,17 @@ _openshift_cli_set_env()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--as=")

     flags+=("--certificate-authority=")

     flags_with_completion+=("--certificate-authority")

@@ -18540,6 +18566,8 @@ _openshift_cli_set_volumes()

     local_nonpersistent_flags+=("--mount-path=")

     flags+=("--name=")

     local_nonpersistent_flags+=("--name=")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -18556,8 +18584,19 @@ _openshift_cli_set_volumes()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

     flags+=("--source=")

     local_nonpersistent_flags+=("--source=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--type=")

     two_word_flags+=("-t")

     local_nonpersistent_flags+=("--type=")

@@ -18916,6 +18955,8 @@ _openshift_cli_volumes()

     local_nonpersistent_flags+=("--mount-path=")

     flags+=("--name=")

     local_nonpersistent_flags+=("--name=")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -18932,8 +18973,19 @@ _openshift_cli_volumes()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

     flags+=("--source=")

     local_nonpersistent_flags+=("--source=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--type=")

     two_word_flags+=("-t")

     local_nonpersistent_flags+=("--type=")

@@ -9067,6 +9067,8 @@ _oc_env()

     local_nonpersistent_flags+=("--from=")

     flags+=("--list")

     local_nonpersistent_flags+=("--list")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -9083,6 +9085,17 @@ _oc_env()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--as=")

     flags+=("--certificate-authority=")

     flags_with_completion+=("--certificate-authority")

@@ -13584,6 +13597,8 @@ _oc_set_env()

     local_nonpersistent_flags+=("--from=")

     flags+=("--list")

     local_nonpersistent_flags+=("--list")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -13600,6 +13615,17 @@ _oc_set_env()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--as=")

     flags+=("--certificate-authority=")

     flags_with_completion+=("--certificate-authority")

@@ -14023,6 +14049,8 @@ _oc_set_volumes()

     local_nonpersistent_flags+=("--mount-path=")

     flags+=("--name=")

     local_nonpersistent_flags+=("--name=")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -14039,8 +14067,19 @@ _oc_set_volumes()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

     flags+=("--source=")

     local_nonpersistent_flags+=("--source=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--type=")

     two_word_flags+=("-t")

     local_nonpersistent_flags+=("--type=")

@@ -14436,6 +14475,8 @@ _oc_volumes()

     local_nonpersistent_flags+=("--mount-path=")

     flags+=("--name=")

     local_nonpersistent_flags+=("--name=")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -14452,8 +14493,19 @@ _oc_volumes()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

     flags+=("--source=")

     local_nonpersistent_flags+=("--source=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--type=")

     two_word_flags+=("-t")

     local_nonpersistent_flags+=("--type=")

@@ -13675,6 +13675,8 @@ _openshift_cli_env()

     local_nonpersistent_flags+=("--from=")

     flags+=("--list")

     local_nonpersistent_flags+=("--list")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -13691,6 +13693,17 @@ _openshift_cli_env()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--as=")

     flags+=("--certificate-authority=")

     flags_with_completion+=("--certificate-authority")

@@ -18257,6 +18270,8 @@ _openshift_cli_set_env()

     local_nonpersistent_flags+=("--from=")

     flags+=("--list")

     local_nonpersistent_flags+=("--list")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -18273,6 +18288,17 @@ _openshift_cli_set_env()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--as=")

     flags+=("--certificate-authority=")

     flags_with_completion+=("--certificate-authority")

@@ -18701,6 +18727,8 @@ _openshift_cli_set_volumes()

     local_nonpersistent_flags+=("--mount-path=")

     flags+=("--name=")

     local_nonpersistent_flags+=("--name=")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -18717,8 +18745,19 @@ _openshift_cli_set_volumes()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

     flags+=("--source=")

     local_nonpersistent_flags+=("--source=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--type=")

     two_word_flags+=("-t")

     local_nonpersistent_flags+=("--type=")

@@ -19077,6 +19116,8 @@ _openshift_cli_volumes()

     local_nonpersistent_flags+=("--mount-path=")

     flags+=("--name=")

     local_nonpersistent_flags+=("--name=")

+    flags+=("--no-headers")

+    local_nonpersistent_flags+=("--no-headers")

     flags+=("--output=")

     two_word_flags+=("-o")

     local_nonpersistent_flags+=("--output=")

@@ -19093,8 +19134,19 @@ _openshift_cli_volumes()

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

+    flags+=("--show-all")

+    flags+=("-a")

+    local_nonpersistent_flags+=("--show-all")

+    flags+=("--show-labels")

+    local_nonpersistent_flags+=("--show-labels")

+    flags+=("--sort-by=")

+    local_nonpersistent_flags+=("--sort-by=")

     flags+=("--source=")

     local_nonpersistent_flags+=("--source=")

+    flags+=("--template=")

+    flags_with_completion+=("--template")

+    flags_completion+=("_filedir")

+    local_nonpersistent_flags+=("--template=")

     flags+=("--type=")

     two_word_flags+=("-t")

     local_nonpersistent_flags+=("--type=")

@@ -42,12 +42,19 @@ DEPRECATED: This command has been moved to "oc set env"

     Display the environment and any changes in the standard format

 .PP

+\fB\-\-no\-headers\fP=false

+    When using the default or custom\-column output format, don't print headers.

+

+.PP

 \fB\-o\fP, \fB\-\-output\fP=""

-    Display the changed objects instead of updating them. One of: json|yaml.

+    Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

+\[la]http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns\[ra]], golang template [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]] and jsonpath template [

+\[la]http://kubernetes.io/docs/user-guide/jsonpath\[ra]].

 .PP

 \fB\-\-output\-version\fP=""

-    Output the changed objects with the given version (default api\-version).

+    Output the formatted object with the given group version (for ex: 'extensions/v1beta1').

 .PP

 \fB\-\-overwrite\fP=true

@@ -69,6 +76,23 @@ DEPRECATED: This command has been moved to "oc set env"

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

+.PP

+\fB\-a\fP, \fB\-\-show\-all\fP=true

+    When printing, show all resources (false means hide terminated pods.)

+

+.PP

+\fB\-\-show\-labels\fP=false

+    When printing, show all labels as the last column (default hide labels column)

+

+.PP

+\fB\-\-sort\-by\fP=""

+    If non\-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.

+

+.PP

+\fB\-\-template\fP=""

+    Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]].

+

 .SH OPTIONS INHERITED FROM PARENT COMMANDS

 .PP

@@ -48,12 +48,19 @@ If "\-\-env \-" is passed, environment variables can be read from STDIN using th

     Display the environment and any changes in the standard format

 .PP

+\fB\-\-no\-headers\fP=false

+    When using the default or custom\-column output format, don't print headers.

+

+.PP

 \fB\-o\fP, \fB\-\-output\fP=""

-    Display the changed objects instead of updating them. One of: json|yaml.

+    Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

+\[la]http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns\[ra]], golang template [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]] and jsonpath template [

+\[la]http://kubernetes.io/docs/user-guide/jsonpath\[ra]].

 .PP

 \fB\-\-output\-version\fP=""

-    Output the changed objects with the given version (default api\-version).

+    Output the formatted object with the given group version (for ex: 'extensions/v1beta1').

 .PP

 \fB\-\-overwrite\fP=true

@@ -75,6 +82,23 @@ If "\-\-env \-" is passed, environment variables can be read from STDIN using th

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

+.PP

+\fB\-a\fP, \fB\-\-show\-all\fP=true

+    When printing, show all resources (false means hide terminated pods.)

+

+.PP

+\fB\-\-show\-labels\fP=false

+    When printing, show all labels as the last column (default hide labels column)

+

+.PP

+\fB\-\-sort\-by\fP=""

+    If non\-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.

+

+.PP

+\fB\-\-template\fP=""

+    Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]].

+

 .SH OPTIONS INHERITED FROM PARENT COMMANDS

 .PP

@@ -92,12 +92,19 @@ For descriptions on other volume types, see

     Name of the volume. If empty, auto generated for add operation

 .PP

+\fB\-\-no\-headers\fP=false

+    When using the default or custom\-column output format, don't print headers.

+

+.PP

 \fB\-o\fP, \fB\-\-output\fP=""

-    Display the changed objects instead of updating them. One of: json|yaml

+    Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

+\[la]http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns\[ra]], golang template [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]] and jsonpath template [

+\[la]http://kubernetes.io/docs/user-guide/jsonpath\[ra]].

 .PP

 \fB\-\-output\-version\fP=""

-    Output the changed objects with the given version (default api\-version).

+    Output the formatted object with the given group version (for ex: 'extensions/v1beta1').

 .PP

 \fB\-\-overwrite\fP=false

@@ -120,10 +127,27 @@ For descriptions on other volume types, see

     Selector (label query) to filter on

 .PP

+\fB\-a\fP, \fB\-\-show\-all\fP=true

+    When printing, show all resources (false means hide terminated pods.)

+

+.PP

+\fB\-\-show\-labels\fP=false

+    When printing, show all labels as the last column (default hide labels column)

+

+.PP

+\fB\-\-sort\-by\fP=""

+    If non\-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.

+

+.PP

 \fB\-\-source\fP=""

     Details of volume source as json string. This can be used if the required volume type is not supported by \-\-type option. (e.g.: '{"gitRepo": {"repository": <git-url>, "revision": <commit-hash>}}')

 .PP

+\fB\-\-template\fP=""

+    Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]].

+

+.PP

 \fB\-t\fP, \fB\-\-type\fP=""

     Type of the volume source for add operation. Supported options: emptyDir, hostPath, secret, configmap, persistentVolumeClaim

@@ -66,12 +66,19 @@ DEPRECATED: This command has been moved to "oc set volume"

     Name of the volume. If empty, auto generated for add operation

 .PP

+\fB\-\-no\-headers\fP=false

+    When using the default or custom\-column output format, don't print headers.

+

+.PP

 \fB\-o\fP, \fB\-\-output\fP=""

-    Display the changed objects instead of updating them. One of: json|yaml

+    Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

+\[la]http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns\[ra]], golang template [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]] and jsonpath template [

+\[la]http://kubernetes.io/docs/user-guide/jsonpath\[ra]].

 .PP

 \fB\-\-output\-version\fP=""

-    Output the changed objects with the given version (default api\-version).

+    Output the formatted object with the given group version (for ex: 'extensions/v1beta1').

 .PP

 \fB\-\-overwrite\fP=false

@@ -94,10 +101,27 @@ DEPRECATED: This command has been moved to "oc set volume"

     Selector (label query) to filter on

 .PP

+\fB\-a\fP, \fB\-\-show\-all\fP=true

+    When printing, show all resources (false means hide terminated pods.)

+

+.PP

+\fB\-\-show\-labels\fP=false

+    When printing, show all labels as the last column (default hide labels column)

+

+.PP

+\fB\-\-sort\-by\fP=""

+    If non\-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.

+

+.PP

 \fB\-\-source\fP=""

     Details of volume source as json string. This can be used if the required volume type is not supported by \-\-type option. (e.g.: '{"gitRepo": {"repository": <git-url>, "revision": <commit-hash>}}')

 .PP

+\fB\-\-template\fP=""

+    Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]].

+

+.PP

 \fB\-t\fP, \fB\-\-type\fP=""

     Type of the volume source for add operation. Supported options: emptyDir, hostPath, secret, configmap, persistentVolumeClaim

@@ -42,12 +42,19 @@ DEPRECATED: This command has been moved to "openshift cli set env"

     Display the environment and any changes in the standard format

 .PP

+\fB\-\-no\-headers\fP=false

+    When using the default or custom\-column output format, don't print headers.

+

+.PP

 \fB\-o\fP, \fB\-\-output\fP=""

-    Display the changed objects instead of updating them. One of: json|yaml.

+    Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

+\[la]http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns\[ra]], golang template [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]] and jsonpath template [

+\[la]http://kubernetes.io/docs/user-guide/jsonpath\[ra]].

 .PP

 \fB\-\-output\-version\fP=""

-    Output the changed objects with the given version (default api\-version).

+    Output the formatted object with the given group version (for ex: 'extensions/v1beta1').

 .PP

 \fB\-\-overwrite\fP=true

@@ -69,6 +76,23 @@ DEPRECATED: This command has been moved to "openshift cli set env"

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

+.PP

+\fB\-a\fP, \fB\-\-show\-all\fP=true

+    When printing, show all resources (false means hide terminated pods.)

+

+.PP

+\fB\-\-show\-labels\fP=false

+    When printing, show all labels as the last column (default hide labels column)

+

+.PP

+\fB\-\-sort\-by\fP=""

+    If non\-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.

+

+.PP

+\fB\-\-template\fP=""

+    Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]].

+

 .SH OPTIONS INHERITED FROM PARENT COMMANDS

 .PP

@@ -48,12 +48,19 @@ If "\-\-env \-" is passed, environment variables can be read from STDIN using th

     Display the environment and any changes in the standard format

 .PP

+\fB\-\-no\-headers\fP=false

+    When using the default or custom\-column output format, don't print headers.

+

+.PP

 \fB\-o\fP, \fB\-\-output\fP=""

-    Display the changed objects instead of updating them. One of: json|yaml.

+    Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

+\[la]http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns\[ra]], golang template [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]] and jsonpath template [

+\[la]http://kubernetes.io/docs/user-guide/jsonpath\[ra]].

 .PP

 \fB\-\-output\-version\fP=""

-    Output the changed objects with the given version (default api\-version).

+    Output the formatted object with the given group version (for ex: 'extensions/v1beta1').

 .PP

 \fB\-\-overwrite\fP=true

@@ -75,6 +82,23 @@ If "\-\-env \-" is passed, environment variables can be read from STDIN using th

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

+.PP

+\fB\-a\fP, \fB\-\-show\-all\fP=true

+    When printing, show all resources (false means hide terminated pods.)

+

+.PP

+\fB\-\-show\-labels\fP=false

+    When printing, show all labels as the last column (default hide labels column)

+

+.PP

+\fB\-\-sort\-by\fP=""

+    If non\-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.

+

+.PP

+\fB\-\-template\fP=""

+    Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]].

+

 .SH OPTIONS INHERITED FROM PARENT COMMANDS

 .PP

@@ -92,12 +92,19 @@ For descriptions on other volume types, see

     Name of the volume. If empty, auto generated for add operation

 .PP

+\fB\-\-no\-headers\fP=false

+    When using the default or custom\-column output format, don't print headers.

+

+.PP

 \fB\-o\fP, \fB\-\-output\fP=""

-    Display the changed objects instead of updating them. One of: json|yaml

+    Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

+\[la]http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns\[ra]], golang template [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]] and jsonpath template [

+\[la]http://kubernetes.io/docs/user-guide/jsonpath\[ra]].

 .PP

 \fB\-\-output\-version\fP=""

-    Output the changed objects with the given version (default api\-version).

+    Output the formatted object with the given group version (for ex: 'extensions/v1beta1').

 .PP

 \fB\-\-overwrite\fP=false

@@ -120,10 +127,27 @@ For descriptions on other volume types, see

     Selector (label query) to filter on

 .PP

+\fB\-a\fP, \fB\-\-show\-all\fP=true

+    When printing, show all resources (false means hide terminated pods.)

+

+.PP

+\fB\-\-show\-labels\fP=false

+    When printing, show all labels as the last column (default hide labels column)

+

+.PP

+\fB\-\-sort\-by\fP=""

+    If non\-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.

+

+.PP

 \fB\-\-source\fP=""

     Details of volume source as json string. This can be used if the required volume type is not supported by \-\-type option. (e.g.: '{"gitRepo": {"repository": <git-url>, "revision": <commit-hash>}}')

 .PP

+\fB\-\-template\fP=""

+    Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]].

+

+.PP

 \fB\-t\fP, \fB\-\-type\fP=""

     Type of the volume source for add operation. Supported options: emptyDir, hostPath, secret, configmap, persistentVolumeClaim

@@ -66,12 +66,19 @@ DEPRECATED: This command has been moved to "openshift cli set volume"

     Name of the volume. If empty, auto generated for add operation

 .PP

+\fB\-\-no\-headers\fP=false

+    When using the default or custom\-column output format, don't print headers.

+

+.PP

 \fB\-o\fP, \fB\-\-output\fP=""

-    Display the changed objects instead of updating them. One of: json|yaml

+    Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

+\[la]http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns\[ra]], golang template [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]] and jsonpath template [

+\[la]http://kubernetes.io/docs/user-guide/jsonpath\[ra]].

 .PP

 \fB\-\-output\-version\fP=""

-    Output the changed objects with the given version (default api\-version).

+    Output the formatted object with the given group version (for ex: 'extensions/v1beta1').

 .PP

 \fB\-\-overwrite\fP=false

@@ -94,10 +101,27 @@ DEPRECATED: This command has been moved to "openshift cli set volume"

     Selector (label query) to filter on

 .PP

+\fB\-a\fP, \fB\-\-show\-all\fP=true

+    When printing, show all resources (false means hide terminated pods.)

+

+.PP

+\fB\-\-show\-labels\fP=false

+    When printing, show all labels as the last column (default hide labels column)

+

+.PP

+\fB\-\-sort\-by\fP=""

+    If non\-empty, sort list types using this field specification.  The field specification is expressed as a JSONPath expression (e.g. '{.metadata.name}'). The field in the API resource specified by this JSONPath expression must be an integer or a string.

+

+.PP

 \fB\-\-source\fP=""

     Details of volume source as json string. This can be used if the required volume type is not supported by \-\-type option. (e.g.: '{"gitRepo": {"repository": <git-url>, "revision": <commit-hash>}}')

 .PP

+\fB\-\-template\fP=""

+    Template string or path to template file to use when \-o=go\-template, \-o=go\-template\-file. The template format is golang templates [

+\[la]http://golang.org/pkg/text/template/#pkg-overview\[ra]].

+

+.PP

 \fB\-t\fP, \fB\-\-type\fP=""

     Type of the volume source for add operation. Supported options: emptyDir, hostPath, secret, configmap, persistentVolumeClaim

@@ -67,7 +67,7 @@ type BuildHookOptions struct {

 	ShortOutput bool

 	Mapper      meta.RESTMapper

-	PrintObject func(runtime.Object) error

+	PrintObject func([]*resource.Info) error

 	Script     string

 	Entrypoint bool

@@ -154,7 +154,9 @@ func (o *BuildHookOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, ar

 	output := kcmdutil.GetFlagString(cmd, "output")

 	if len(output) != 0 {

-		o.PrintObject = func(obj runtime.Object) error { return f.PrintObject(cmd, mapper, obj, o.Out) }

+		o.PrintObject = func(infos []*resource.Info) error {

+			return f.PrintResourceInfos(cmd, infos, o.Out)

+		}

 	}

 	o.Encoder = f.JSONEncoder()

@@ -216,11 +218,7 @@ func (o *BuildHookOptions) Run() error {

 	}

 	if o.PrintObject != nil {

-		object, err := resource.AsVersionedObject(infos, !singular, o.OutputVersion, kapi.Codecs.LegacyCodec(o.OutputVersion))

-		if err != nil {

-			return err

-		}

-		return o.PrintObject(object)

+		return o.PrintObject(infos)

 	}

 	failed := false

@@ -66,7 +66,7 @@ type BuildSecretOptions struct {

 	Local       bool

 	Mapper      meta.RESTMapper

-	PrintObject func(runtime.Object) error

+	PrintObject func([]*resource.Info) error

 	Secret string

 	Push   bool

@@ -195,8 +195,10 @@ func (o *BuildSecretOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,

 	}