Merge pull request #52086 from luxas/kubeadm_new_init_token_group

Automatic merge from submit-queue kubeadm: Set the new BT auth group on the init token **What this PR does / why we need it**: What I forgot to do in https://github.com/kubernetes/kubernetes/pull/51956 😅 When we now have the new group, we should also set it on the token, otherwise nodes can't be joined On the good side, our CI testing broke https://k8s-testgrid.appspot.com/sig-cluster-lifecycle#kubeadm-gce Great to see that it actually works :) **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` @kubernetes/sig-cluster-lifecycle-pr-reviews

Merge pull request #52086 from luxas/kubeadm_new_init_token_group
54d0d855 · Kubernetes Submit Queue · GitHub · ea017719 · 74954fda · 54d0d855
Commit 54d0d855 authored Sep 07, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

init.go cmd/kubeadm/app/cmd/init.go +1 -1

No files found.
--- a/cmd/kubeadm/app/cmd/init.go
+++ b/cmd/kubeadm/app/cmd/init.go
@@ -375,7 +375,7 @@ func (i *Init) Run(out io.Writer) error {
 	// Create the default node bootstrap token
 	tokenDescription := "The default bootstrap token generated by 'kubeadm init'."
-	if err := nodebootstraptokenphase.UpdateOrCreateToken(client, i.cfg.Token, false, i.cfg.TokenTTL.Duration, kubeadmconstants.DefaultTokenUsages, []string{}, tokenDescription); err != nil {
+	if err := nodebootstraptokenphase.UpdateOrCreateToken(client, i.cfg.Token, false, i.cfg.TokenTTL.Duration, kubeadmconstants.DefaultTokenUsages, []string{kubeadmconstants.V18NodeBootstrapTokenAuthGroup}, tokenDescription); err != nil {
 		return err
 	}
 	// Create RBAC rules that makes the bootstrap tokens able to post CSRs