github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-20 01:01:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15210 from brendandburns/docs

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-21 07:58:46 -08:00
commit 6815cbf742
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/cmd/util/printing.go
View File

@ -102,7 +102,9 @@ func PrinterForCommand(cmd *cobra.Command) (kubectl.ResourcePrinter, bool, error
outputFormat = "template" 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 { for _, format := range templateFormat {
if strings.HasPrefix(outputFormat, format) { if strings.HasPrefix(outputFormat, format) {
templateFile = outputFormat[len(format):] templateFile = outputFormat[len(format):]