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

fix kubectl config view to respect serialization formats

Browse Source
This commit is contained in:
deads2k 2015-02-20 09:03:38 -05:00
parent d6851729d2
commit 5c4b6583e4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/man/man1/kubectl-config-view.1
View File

@ -172,7 +172,7 @@ $ kubectl config view
$ kubectl config view \-\-local $ kubectl config view \-\-local
// Get the password for the e2e user // Get the password for the e2e user
$ kubectl config view \-o template \-\-template='\{\{ index . "users" "e2e" "password" \}\}' $ kubectl config view \-o template \-\-template='\{\{range .users\}\}\{\{ if eq .name "e2e" \}\}\{\{ index .user.password \}\}\{\{end\}\}\{\{end\}\}'
.fi .fi
.RE .RE

8
pkg/kubectl/cmd/config/view.go
View File

@ -25,6 +25,8 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"
clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api/latest"
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
) )
@ -45,7 +47,7 @@ $ kubectl config view
$ kubectl config view --local $ kubectl config view --local
// Get the password for the e2e user // Get the password for the e2e user
$ kubectl config view -o template --template='{{ index . "users" "e2e" "password" }}'` $ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2e" }}{{ index .user.password }}{{end}}{{end}}'`
) )
func NewCmdConfigView(out io.Writer, pathOptions *pathOptions) *cobra.Command { func NewCmdConfigView(out io.Writer, pathOptions *pathOptions) *cobra.Command {
@ -63,10 +65,14 @@ func NewCmdConfigView(out io.Writer, pathOptions *pathOptions) *cobra.Command {
if err != nil { if err != nil {
glog.FatalDepth(1, err) glog.FatalDepth(1, err)
} }
version := cmdutil.OutputVersion(cmd, latest.Version)
printer = kubectl.NewVersionedPrinter(printer, clientcmdapi.Scheme, version)
config, err := options.loadConfig() config, err := options.loadConfig()
if err != nil { if err != nil {
glog.FatalDepth(1, err) glog.FatalDepth(1, err)
} }
err = printer.PrintObj(config, out) err = printer.PrintObj(config, out)
if err != nil { if err != nil {
glog.FatalDepth(1, err) glog.FatalDepth(1, err)