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

Merge pull request #45641 from xilabao/update-token-ttl-description

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 44626, 45641)

update token ttl description
This commit is contained in:
Kubernetes Submit Queue 2017-05-11 03:59:38 -07:00 committed by GitHub
commit 640373da10
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/token.go
View File

@ -114,7 +114,7 @@ func NewCmdToken(out io.Writer, errW io.Writer) *cobra.Command {
}, },
} }
createCmd.Flags().DurationVar(&tokenDuration, createCmd.Flags().DurationVar(&tokenDuration,
"ttl", kubeadmconstants.DefaultTokenDuration, "The duration before the token is automatically deleted. 0 means 'never expires'.") "ttl", kubeadmconstants.DefaultTokenDuration, "The duration before the token is automatically deleted (e.g. 1s, 2m, 3h). 0 means 'never expires'.")
createCmd.Flags().StringSliceVar(&usages, createCmd.Flags().StringSliceVar(&usages,
"usages", kubeadmconstants.DefaultTokenUsages, "The ways in which this token can be used. Valid options: [signing,authentication].") "usages", kubeadmconstants.DefaultTokenUsages, "The ways in which this token can be used. Valid options: [signing,authentication].")
createCmd.Flags().StringVar(&description, createCmd.Flags().StringVar(&description,