Merge pull request #70727 from yagonobre/bootstrap-token

cmd/kubeadm/app/cmd/BUILD

@@ -38,7 +38,6 @@ go_library(
         "//cmd/kubeadm/app/images:go_default_library",
         "//cmd/kubeadm/app/phases/addons/dns:go_default_library",
         "//cmd/kubeadm/app/phases/addons/proxy:go_default_library",
-        "//cmd/kubeadm/app/phases/bootstraptoken/clusterinfo:go_default_library",
         "//cmd/kubeadm/app/phases/bootstraptoken/node:go_default_library",
         "//cmd/kubeadm/app/phases/certs:go_default_library",
         "//cmd/kubeadm/app/phases/controlplane:go_default_library",

cmd/kubeadm/app/cmd/alpha/alpha.go

@@ -53,7 +53,6 @@ func newCmdPhase(out io.Writer) *cobra.Command {
 	}
 
 	cmd.AddCommand(phases.NewCmdAddon())
-	cmd.AddCommand(phases.NewCmdBootstrapToken())
 	cmd.AddCommand(phases.NewCmdMarkMaster())
 
 	return cmd

cmd/kubeadm/app/cmd/init.go

@@ -44,8 +44,6 @@ import (
 	"k8s.io/kubernetes/cmd/kubeadm/app/features"
 	dnsaddonphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns"
 	proxyaddonphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/proxy"
-	clusterinfophase "k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo"
-	nodebootstraptokenphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/node"
 	certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs"
 	kubeconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig"
 	kubeletphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubelet"
@@ -182,6 +180,7 @@ func NewCmdInit(out io.Writer) *cobra.Command {
 	initRunner.AppendPhase(phases.NewEtcdPhase())
 	initRunner.AppendPhase(phases.NewWaitControlPlanePhase())
 	initRunner.AppendPhase(phases.NewUploadConfigPhase())
+	initRunner.AppendPhase(phases.NewBootstrapTokenPhase())
 	// TODO: add other phases to the runner.
 
 	// sets the data builder function, that will be used by the runner
@@ -511,51 +510,6 @@ func runInit(i *initData, out io.Writer) error {
 		}
 	}
 
-	// PHASE 5: Set up the node bootstrap tokens
-	tokens := []string{}
-	for _, bt := range i.cfg.BootstrapTokens {
-		tokens = append(tokens, bt.Token.String())
-	}
-	if !i.skipTokenPrint {
-		if len(tokens) == 1 {
-			fmt.Printf("[bootstraptoken] using token: %s\n", tokens[0])
-		} else if len(tokens) > 1 {
-			fmt.Printf("[bootstraptoken] using tokens: %v\n", tokens)
-		}
-	}
-
-	// Create the default node bootstrap token
-	glog.V(1).Infof("[init] creating RBAC rules to generate default bootstrap token")
-	if err := nodebootstraptokenphase.UpdateOrCreateTokens(client, false, i.cfg.BootstrapTokens); err != nil {
-		return errors.Wrap(err, "error updating or creating token")
-	}
-	// Create RBAC rules that makes the bootstrap tokens able to post CSRs
-	glog.V(1).Infof("[init] creating RBAC rules to allow bootstrap tokens to post CSR")
-	if err := nodebootstraptokenphase.AllowBootstrapTokensToPostCSRs(client); err != nil {
-		return errors.Wrap(err, "error allowing bootstrap tokens to post CSRs")
-	}
-	// Create RBAC rules that makes the bootstrap tokens able to get their CSRs approved automatically
-	glog.V(1).Infof("[init] creating RBAC rules to automatic approval of CSRs automatically")
-	if err := nodebootstraptokenphase.AutoApproveNodeBootstrapTokens(client); err != nil {
-		return errors.Wrap(err, "error auto-approving node bootstrap tokens")
-	}
-
-	// Create/update RBAC rules that makes the nodes to rotate certificates and get their CSRs approved automatically
-	glog.V(1).Infof("[init] creating/updating RBAC rules for rotating certificate")
-	if err := nodebootstraptokenphase.AutoApproveNodeCertificateRotation(client); err != nil {
-		return err
-	}
-
-	// Create the cluster-info ConfigMap with the associated RBAC rules
-	glog.V(1).Infof("[init] creating bootstrap configmap")
-	if err := clusterinfophase.CreateBootstrapConfigMapIfNotExists(client, adminKubeConfigPath); err != nil {
-		return errors.Wrap(err, "error creating bootstrap configmap")
-	}
-	glog.V(1).Infof("[init] creating ClusterInfo RBAC rules")
-	if err := clusterinfophase.CreateClusterInfoRBACRules(client); err != nil {
-		return errors.Wrap(err, "error creating clusterinfo RBAC rules")
-	}
-
 	glog.V(1).Infof("[init] ensuring DNS addon")
 	if err := dnsaddonphase.EnsureDNSAddon(i.cfg, client); err != nil {
 		return errors.Wrap(err, "error ensuring dns addon")
@@ -573,7 +527,7 @@ func runInit(i *initData, out io.Writer) error {
 	}
 
 	// Prints the join command, multiple times in case the user has multiple tokens
-	for _, token := range tokens {
+	for _, token := range i.Tokens() {
 		if err := printJoinCommand(out, adminKubeConfigPath, token, i.skipTokenPrint); err != nil {
 			return errors.Wrap(err, "failed to print join command")
 		}

cmd/kubeadm/app/cmd/phases/BUILD

@@ -52,12 +52,10 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
-        "//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
         "//vendor/github.com/renstrom/dedent:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
-        "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
     ],
 )

docs/.generated_docs

@@ -27,13 +27,6 @@ docs/admin/kubeadm_alpha_phase_addon.md
 docs/admin/kubeadm_alpha_phase_addon_all.md
 docs/admin/kubeadm_alpha_phase_addon_coredns.md
 docs/admin/kubeadm_alpha_phase_addon_kube-proxy.md
-docs/admin/kubeadm_alpha_phase_bootstrap-token.md
-docs/admin/kubeadm_alpha_phase_bootstrap-token_all.md
-docs/admin/kubeadm_alpha_phase_bootstrap-token_cluster-info.md
-docs/admin/kubeadm_alpha_phase_bootstrap-token_create.md
-docs/admin/kubeadm_alpha_phase_bootstrap-token_node.md
-docs/admin/kubeadm_alpha_phase_bootstrap-token_node_allow-auto-approve.md
-docs/admin/kubeadm_alpha_phase_bootstrap-token_node_allow-post-csrs.md
 docs/admin/kubeadm_alpha_phase_mark-master.md
 docs/admin/kubeadm_alpha_preflight.md
 docs/admin/kubeadm_alpha_preflight_node.md
@@ -54,6 +47,7 @@ docs/admin/kubeadm_config_upload_from-flags.md
 docs/admin/kubeadm_config_view.md
 docs/admin/kubeadm_init.md
 docs/admin/kubeadm_init_phase.md
+docs/admin/kubeadm_init_phase_bootstrap-token.md
 docs/admin/kubeadm_init_phase_certs.md
 docs/admin/kubeadm_init_phase_certs_apiserver-etcd-client.md
 docs/admin/kubeadm_init_phase_certs_apiserver-kubelet-client.md
@@ -123,13 +117,6 @@ docs/man/man1/kubeadm-alpha-phase-addon-all.1
 docs/man/man1/kubeadm-alpha-phase-addon-coredns.1
 docs/man/man1/kubeadm-alpha-phase-addon-kube-proxy.1
 docs/man/man1/kubeadm-alpha-phase-addon.1
-docs/man/man1/kubeadm-alpha-phase-bootstrap-token-all.1
-docs/man/man1/kubeadm-alpha-phase-bootstrap-token-cluster-info.1
-docs/man/man1/kubeadm-alpha-phase-bootstrap-token-create.1
-docs/man/man1/kubeadm-alpha-phase-bootstrap-token-node-allow-auto-approve.1
-docs/man/man1/kubeadm-alpha-phase-bootstrap-token-node-allow-post-csrs.1
-docs/man/man1/kubeadm-alpha-phase-bootstrap-token-node.1
-docs/man/man1/kubeadm-alpha-phase-bootstrap-token.1
 docs/man/man1/kubeadm-alpha-phase-mark-master.1
 docs/man/man1/kubeadm-alpha-phase.1
 docs/man/man1/kubeadm-alpha-preflight-node.1
@@ -151,6 +138,7 @@ docs/man/man1/kubeadm-config-upload-from-flags.1
 docs/man/man1/kubeadm-config-upload.1
 docs/man/man1/kubeadm-config-view.1
 docs/man/man1/kubeadm-config.1
+docs/man/man1/kubeadm-init-phase-bootstrap-token.1
 docs/man/man1/kubeadm-init-phase-certs-apiserver-etcd-client.1
 docs/man/man1/kubeadm-init-phase-certs-apiserver-kubelet-client.1
 docs/man/man1/kubeadm-init-phase-certs-apiserver.1

docs/admin/kubeadm_alpha_phase_bootstrap-token_cluster-info.md

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/admin/kubeadm_alpha_phase_bootstrap-token_create.md

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/admin/kubeadm_alpha_phase_bootstrap-token_node.md

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/admin/kubeadm_alpha_phase_bootstrap-token_node_allow-auto-approve.md

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/admin/kubeadm_alpha_phase_bootstrap-token_node_allow-post-csrs.md

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/man/man1/kubeadm-alpha-phase-bootstrap-token-all.1

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/man/man1/kubeadm-alpha-phase-bootstrap-token-cluster-info.1

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/man/man1/kubeadm-alpha-phase-bootstrap-token-create.1

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/man/man1/kubeadm-alpha-phase-bootstrap-token-node-allow-auto-approve.1

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/man/man1/kubeadm-alpha-phase-bootstrap-token-node-allow-post-csrs.1

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/man/man1/kubeadm-alpha-phase-bootstrap-token-node.1

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.

docs/man/man1/kubeadm-alpha-phase-bootstrap-token.1

-This file is autogenerated, but we've stopped checking such files into the
-repository to reduce the need for rebases. Please run hack/generate-docs.sh to
-populate this file.