github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Make "kubectl version" json output more readable.

Browse Source
This commit is contained in:
xiangpengzhao 2017-05-29 23:56:00 +08:00
parent ba2bdb1aea
commit a6be3b64f8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/lib/test.sh
View File

@ -315,7 +315,7 @@ kube::test::version::object_to_file() {
kube::test::version::json_object_to_file() { kube::test::version::json_object_to_file() {
flags=$1 flags=$1
file=$2 file=$2
kubectl version $flags --output json | sed -e s/'\"'/''/g -e s/'}'/''/g -e s/'{'/''/g -e s/'clientVersion:'/'clientVersion:,'/ -e s/'serverVersion:'/'serverVersion:,'/ | tr , '\n' > "${file}" kubectl version $flags --output json | sed -e s/' '/''/g -e s/'\"'/''/g -e s/'}'/''/g -e s/'{'/''/g -e s/'clientVersion:'/'clientVersion:,'/ -e s/'serverVersion:'/'serverVersion:,'/ | tr , '\n' > "${file}"
} }
kube::test::version::json_client_server_object_to_file() { kube::test::version::json_client_server_object_to_file() {

4
pkg/kubectl/cmd/version.go
View File

@ -66,7 +66,7 @@ func NewCmdVersion(f cmdutil.Factory, out io.Writer) *cobra.Command {
} }
cmd.Flags().BoolP("client", "c", false, "Client version only (no server required).") cmd.Flags().BoolP("client", "c", false, "Client version only (no server required).")
cmd.Flags().BoolP("short", "", false, "Print just the version number.") cmd.Flags().BoolP("short", "", false, "Print just the version number.")
cmd.Flags().String("output", "", "one of 'yaml' or 'json'") cmd.Flags().StringP("output", "o", "", "One of 'yaml' or 'json'.")
cmd.Flags().MarkShorthandDeprecated("client", "please use --client instead.") cmd.Flags().MarkShorthandDeprecated("client", "please use --client instead.")
return cmd return cmd
} }
@ -117,7 +117,7 @@ func (o *VersionOptions) Run(f cmdutil.Factory, out io.Writer) error {
} }
fmt.Fprintln(out, string(marshalled)) fmt.Fprintln(out, string(marshalled))
case "json": case "json":
marshalled, err := json.Marshal(&versionInfo) marshalled, err := json.MarshalIndent(&versionInfo, "", " ")
if err != nil { if err != nil {
return err return err
} }