Merge pull request #56025 from fabriziopandini/kubeadm-bootstrap

Automatic merge from submit-queue. 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>. Enhance kubeadm `bootstrap-token` **What this PR does / why we need it**: This PR is part of the effort for improving kubeadm phases, and more specifically improves `bootstrap-token` phase by implementing a behaviour consistent with `kubeadm init`, that is: - `all` subcommand - `create` subcommand (with CA pinning stuff and --config) - `cluster-info` subcommand was modified, removing --config (thus making it consistent with other phases) - `allow-auto-approve` subcommand was improved, implementing also creation of RBAC rules for certificate rotation (thus making it consistent with `kubeadm init`) - Reference docs improved **Which issue(s) this PR fixes** part of the effort for [#461](https://github.com/kubernetes/kubeadm/issues/461) part of the effort for [#454](https://github.com/kubernetes/kubeadm/issues/454) part of the effort for [#265](https://github.com/kubernetes/kubeadm/issues/265) **Special notes for your reviewer**: CC @luxas **Release note**: ```release-note NONE ```

Merge pull request #56025 from fabriziopandini/kubeadm-bootstrap
ec036d9c · Kubernetes Submit Queue · GitHub · 7b9affae · 29d9a39e · ec036d9c
Unverified Commit ec036d9c authored Nov 21, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 21, 2017
7 changed files
--- a/cmd/kubeadm/app/cmd/phases/BUILD
+++ b/cmd/kubeadm/app/cmd/phases/BUILD
@@ -35,6 +35,7 @@ go_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/certs/pkiutil:go_default_library",
        "//cmd/kubeadm/app/phases/controlplane:go_default_library",
        "//cmd/kubeadm/app/phases/etcd:go_default_library",
        "//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
@@ -46,10 +47,14 @@ go_library(
        "//cmd/kubeadm/app/util/apiclient:go_default_library",
        "//cmd/kubeadm/app/util/config:go_default_library",
        "//cmd/kubeadm/app/util/kubeconfig:go_default_library",
+        "//cmd/kubeadm/app/util/pubkeypin:go_default_library",
        "//pkg/api/legacyscheme:go_default_library",
+        "//pkg/bootstrap/api:go_default_library",
        "//pkg/util/normalizer:go_default_library",
        "//vendor/github.com/spf13/cobra:go_default_library",
+        "//vendor/github.com/spf13/pflag:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
        "//vendor/k8s.io/utils/exec:go_default_library",
    ],

--- a/cmd/kubeadm/app/cmd/phases/bootstraptoken.go
+++ b/cmd/kubeadm/app/cmd/phases/bootstraptoken.go
--- a/docs/.generated_docs
+++ b/docs/.generated_docs
@@ -12,7 +12,9 @@ docs/admin/kubeadm_alpha_phase_addon_all.md
 docs/admin/kubeadm_alpha_phase_addon_kube-dns.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
@@ -73,7 +75,9 @@ docs/man/man1/kubeadm-alpha-phase-addon-all.1
 docs/man/man1/kubeadm-alpha-phase-addon-kube-dns.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

--- a/docs/admin/kubeadm_alpha_phase_bootstrap-token_all.md
+++ b/docs/admin/kubeadm_alpha_phase_bootstrap-token_all.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.
--- a/docs/admin/kubeadm_alpha_phase_bootstrap-token_create.md
+++ b/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.
--- a/docs/man/man1/kubeadm-alpha-phase-bootstrap-token-all.1
+++ b/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.
--- a/docs/man/man1/kubeadm-alpha-phase-bootstrap-token-create.1
+++ b/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.