github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change kubectl help/examples to use jsonpath instead of template

pull/6/head
Jeff Lowdermilk 2015-12-09 11:27:54 -08:00
parent 282b9eebb8
commit 734a8c0602
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ kubectl config view \- Displays merged kubeconfig settings or a specified kubeco
Displays merged kubeconfig settings or a specified kubeconfig file. Displays merged kubeconfig settings or a specified kubeconfig file.
.PP .PP
You can use \-\-output=template \-\-template=TEMPLATE to extract specific values. You can use \-\-output jsonpath={...} to extract specific values using a jsonpath expression.
.SH OPTIONS .SH OPTIONS
@ -167,7 +167,7 @@ You can use \-\-output=template \-\-template=TEMPLATE to extract specific values
$ kubectl config view $ kubectl config view
# Get the password for the e2e user # Get the password for the e2e user
$ kubectl config view \-o template \-\-template='{{range .users}}{{ if eq .name "e2e" }}{{ index .user.password }}{{end}}{{end}}' $ kubectl config view \-o jsonpath='{.users[?(@.name == "e2e")].user.password}'
.fi .fi
.RE .RE

6
docs/user-guide/kubectl/kubectl_config_view.md
View File

@ -41,7 +41,7 @@ Displays merged kubeconfig settings or a specified kubeconfig file.
Displays merged kubeconfig settings or a specified kubeconfig file. Displays merged kubeconfig settings or a specified kubeconfig file.
You can use --output=template --template=TEMPLATE to extract specific values. You can use --output jsonpath={...} to extract specific values using a jsonpath expression.
``` ```
kubectl config view kubectl config view
@ -54,7 +54,7 @@ kubectl config view
$ kubectl config view $ kubectl config view
# Get the password for the e2e user # Get the password for the e2e user
$ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2e" }}{{ index .user.password }}{{end}}{{end}}' $ kubectl config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}'
``` ```
### Options ### Options
@ -104,7 +104,7 @@ $ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2
* [kubectl config](kubectl_config.md) - config modifies kubeconfig files * [kubectl config](kubectl_config.md) - config modifies kubeconfig files
###### Auto generated by spf13/cobra on 8-Jan-2016 ###### Auto generated by spf13/cobra on 28-Jan-2016
<!-- BEGIN MUNGE: GENERATED_ANALYTICS --> <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config_view.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/user-guide/kubectl/kubectl_config_view.md?pixel)]()

6
pkg/kubectl/cmd/config/config.go
View File

@ -71,9 +71,9 @@ func NewCmdConfig(pathOptions *PathOptions, out io.Writer) *cobra.Command {
Long: `config modifies kubeconfig files using subcommands like "kubectl config set current-context my-context" Long: `config modifies kubeconfig files using subcommands like "kubectl config set current-context my-context"
The loading order follows these rules: The loading order follows these rules:
1. If the --` + pathOptions.ExplicitFileFlag + ` flag is set, then only that file is loaded. The flag may only be set once and no merging takes place. 1. If the --` + pathOptions.ExplicitFileFlag + ` flag is set, then only that file is loaded. The flag may only be set once and no merging takes place.
2. If $` + pathOptions.EnvVar + ` environment variable is set, then it is used a list of paths (normal path delimitting rules for your system). These paths are merged together. When a value is modified, it is modified in the file that defines the stanza. When a value is created, it is created in the first file that exists. If no files in the chain exist, then it creates the last file in the list. 2. If $` + pathOptions.EnvVar + ` environment variable is set, then it is used a list of paths (normal path delimitting rules for your system). These paths are merged together. When a value is modified, it is modified in the file that defines the stanza. When a value is created, it is created in the first file that exists. If no files in the chain exist, then it creates the last file in the list.
3. Otherwise, ` + path.Join("${HOME}", pathOptions.GlobalFileSubpath) + ` is used and no merging takes place. 3. Otherwise, ` + path.Join("${HOME}", pathOptions.GlobalFileSubpath) + ` is used and no merging takes place.
`, `,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
cmd.Help() cmd.Help()

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

@ -42,12 +42,12 @@ type ViewOptions struct {
const ( const (
view_long = `Displays merged kubeconfig settings or a specified kubeconfig file. view_long = `Displays merged kubeconfig settings or a specified kubeconfig file.
You can use --output=template --template=TEMPLATE to extract specific values.` You can use --output jsonpath={...} to extract specific values using a jsonpath expression.`
view_example = `# Show Merged kubeconfig settings. view_example = `# Show Merged kubeconfig settings.
$ kubectl config view $ kubectl config view
# Get the password for the e2e user # Get the password for the e2e user
$ kubectl config view -o template --template='{{range .users}}{{ if eq .name "e2e" }}{{ index .user.password }}{{end}}{{end}}'` $ kubectl config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}'`
) )
func NewCmdConfigView(out io.Writer, ConfigAccess ConfigAccess) *cobra.Command { func NewCmdConfigView(out io.Writer, ConfigAccess ConfigAccess) *cobra.Command {