Merge pull request #15210 from brendandburns/docs

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-21 07:58:46 -08:00
commit 6815cbf742

View File

@ -102,7 +102,9 @@ func PrinterForCommand(cmd *cobra.Command) (kubectl.ResourcePrinter, bool, error
outputFormat = "template"
}
templateFormat := []string{"go-template=", "go-template-file=", "jsonpath=", "jsonpath-file="}
templateFormat := []string{
"go-template=", "go-template-file=", "jsonpath=", "jsonpath-file=", "custom-columns=", "custom-columns-file=",
}
for _, format := range templateFormat {
if strings.HasPrefix(outputFormat, format) {
templateFile = outputFormat[len(format):]