From 4a098980d6cad4fa0a6ff0d6b68a3ff82c6fd281 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Mon, 5 Nov 2018 22:15:31 +0200 Subject: [PATCH] kubeadm: make sure that commands are not added for hidden phases --- cmd/kubeadm/app/cmd/phases/workflow/runner.go | 5 +++++ docs/.generated_docs | 2 -- docs/admin/kubeadm_init_phase_wait-control-plane.md | 3 --- docs/man/man1/kubeadm-init-phase-wait-control-plane.1 | 3 --- 4 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 docs/admin/kubeadm_init_phase_wait-control-plane.md delete mode 100644 docs/man/man1/kubeadm-init-phase-wait-control-plane.1 diff --git a/cmd/kubeadm/app/cmd/phases/workflow/runner.go b/cmd/kubeadm/app/cmd/phases/workflow/runner.go index 1f9462b23f..77d990f33f 100644 --- a/cmd/kubeadm/app/cmd/phases/workflow/runner.go +++ b/cmd/kubeadm/app/cmd/phases/workflow/runner.go @@ -301,6 +301,11 @@ func (e *Runner) BindToCommand(cmd *cobra.Command) { // generate all the nested subcommands for invoking single phases subcommands := map[string]*cobra.Command{} e.visitAll(func(p *phaseRunner) error { + // skip hidden phases + if p.Hidden { + return nil + } + // creates nested phase subcommand var phaseCmd = &cobra.Command{ Use: strings.ToLower(p.Name), diff --git a/docs/.generated_docs b/docs/.generated_docs index 5709ff5bf5..0d06ea8a22 100644 --- a/docs/.generated_docs +++ b/docs/.generated_docs @@ -80,7 +80,6 @@ docs/admin/kubeadm_init_phase_kubeconfig_kubelet.md docs/admin/kubeadm_init_phase_kubeconfig_scheduler.md docs/admin/kubeadm_init_phase_kubelet-start.md docs/admin/kubeadm_init_phase_preflight.md -docs/admin/kubeadm_init_phase_wait-control-plane.md docs/admin/kubeadm_join.md docs/admin/kubeadm_reset.md docs/admin/kubeadm_token.md @@ -176,7 +175,6 @@ docs/man/man1/kubeadm-init-phase-kubeconfig-scheduler.1 docs/man/man1/kubeadm-init-phase-kubeconfig.1 docs/man/man1/kubeadm-init-phase-kubelet-start.1 docs/man/man1/kubeadm-init-phase-preflight.1 -docs/man/man1/kubeadm-init-phase-wait-control-plane.1 docs/man/man1/kubeadm-init-phase.1 docs/man/man1/kubeadm-init.1 docs/man/man1/kubeadm-join.1 diff --git a/docs/admin/kubeadm_init_phase_wait-control-plane.md b/docs/admin/kubeadm_init_phase_wait-control-plane.md deleted file mode 100644 index b6fd7a0f98..0000000000 --- a/docs/admin/kubeadm_init_phase_wait-control-plane.md +++ /dev/null @@ -1,3 +0,0 @@ -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. diff --git a/docs/man/man1/kubeadm-init-phase-wait-control-plane.1 b/docs/man/man1/kubeadm-init-phase-wait-control-plane.1 deleted file mode 100644 index b6fd7a0f98..0000000000 --- a/docs/man/man1/kubeadm-init-phase-wait-control-plane.1 +++ /dev/null @@ -1,3 +0,0 @@ -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.