From dbf28cbe5130e794b5540971f4e734277d2f72d5 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sun, 2 Nov 2014 09:21:50 -0500 Subject: [PATCH] Lock the output format version based on user input --- pkg/kubectl/cmd/get.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go index bd6e2cbead3..d232d8ee8b0 100644 --- a/pkg/kubectl/cmd/get.go +++ b/pkg/kubectl/cmd/get.go @@ -68,9 +68,12 @@ Examples: checkErr(err) if versioned { - // TODO Add an --output-version lock which can ensure that regardless of the - // server version, the client output stays the same. - obj, err = mapping.ObjectConvertor.ConvertToVersion(obj, mapping.APIVersion) + outputVersion := getFlagString(cmd, "output-version") + if len(outputVersion) == 0 { + outputVersion = mapping.APIVersion + } + + obj, err = mapping.ObjectConvertor.ConvertToVersion(obj, outputVersion) checkErr(err) } @@ -80,6 +83,7 @@ Examples: }, } cmd.Flags().StringP("output", "o", "", "Output format: json|yaml|template|templatefile") + cmd.Flags().String("output-version", "", "Output the formatted object with the given version (default api-version)") cmd.Flags().Bool("no-headers", false, "When using the default output, don't print headers") cmd.Flags().StringP("template", "t", "", "Template string or path to template file to use when --output=template or --output=templatefile") cmd.Flags().StringP("selector", "l", "", "Selector (label query) to filter on")