github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53512 from jbeda/fix-create-token

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 53044, 52956, 53512, 53028). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add group by default to kubeadm token create

Changes the default when creating tokens to include the group that is used during `kubeadm init`.  The most likely use of this function is to create/recreate tokens to use with `kubeadm join` so let's make that a default.

fixes https://github.com/kubernetes/kubeadm/issues/483


```release-note
Change `kubeadm create token` to default to the group that almost everyone will want to use.  The group is system:bootstrappers:kubeadm:default-node-token and is the group that kubeadm sets up, via an RBAC binding, for auto-approval (system:certificates.k8s.io:certificatesigningrequests:nodeclient).
```

This is a cherry pick candidate for 1.8.1.
This commit is contained in:
Kubernetes Submit Queue
2017-10-05 18:29:42 -07:00
committed by GitHub
parent d2276079f6 e053f56d6b
commit 58e1daca03
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ func NewCmdToken(out io.Writer, errW io.Writer) *cobra.Command {
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().StringSliceVar(&extraGroups, createCmd.Flags().StringSliceVar(&extraGroups,
"groups", []string{}, "groups", []string{kubeadmconstants.V18NodeBootstrapTokenAuthGroup},
fmt.Sprintf("Extra groups that this token will authenticate as when used for authentication. Must match %q.", bootstrapapi.BootstrapGroupPattern)) fmt.Sprintf("Extra groups that this token will authenticate as when used for authentication. Must match %q.", bootstrapapi.BootstrapGroupPattern))
createCmd.Flags().StringVar(&description, createCmd.Flags().StringVar(&description,
"description", "", "A human friendly description of how this token is used.") "description", "", "A human friendly description of how this token is used.")