Merge pull request kubernetes#94668 from neolit123/1.20-kubeadm-remove-dkc

kubeadm: remove the "alpha kubelet config enable-dynamic" command

Author: k8s-ci-robot

cmd/kubeadm/app/cmd/alpha/BUILD

@@ -6,7 +6,6 @@ go_library(
         "alpha.go",
         "certs.go",
         "kubeconfig.go",
-        "kubelet.go",
         "selfhosting.go",
     ],
     importpath = "k8s.io/kubernetes/cmd/kubeadm/app/cmd/alpha",
@@ -25,13 +24,11 @@ go_library(
         "//cmd/kubeadm/app/phases/certs/renewal:go_default_library",
         "//cmd/kubeadm/app/phases/copycerts:go_default_library",
         "//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
-        "//cmd/kubeadm/app/phases/kubelet:go_default_library",
         "//cmd/kubeadm/app/phases/selfhosting:go_default_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",
         "//staging/src/k8s.io/apimachinery/pkg/util/duration:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
         "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",

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

@@ -20,7 +20,6 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
-	cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util"
 )
 
 // NewCmdAlpha returns "kubeadm alpha" command.
@@ -31,24 +30,8 @@ func NewCmdAlpha(in io.Reader, out io.Writer) *cobra.Command {
 	}
 
 	cmd.AddCommand(newCmdCertsUtility(out))
-	cmd.AddCommand(newCmdKubeletUtility())
 	cmd.AddCommand(newCmdKubeConfigUtility(out))
 	cmd.AddCommand(NewCmdSelfhosting(in))
 
-	// TODO: This command should be removed as soon as the kubeadm init phase refactoring is completed.
-	//		 current phases implemented as cobra.Commands should become workflow.Phases, while other utilities
-	// 		 hosted under kubeadm alpha phases command should found a new home under kubeadm alpha (without phases)
-	cmd.AddCommand(newCmdPhase(out))
-
-	return cmd
-}
-
-func newCmdPhase(out io.Writer) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "phase",
-		Short: "Invoke subsets of kubeadm functions separately for a manual install",
-		Long:  cmdutil.MacroCommandLongDescription,
-	}
-
 	return cmd
 }

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

@@ -4,7 +4,6 @@ go_library(
     name = "go_default_library",
     srcs = [
         "config.go",
-        "dynamic.go",
         "flags.go",
         "kubelet.go",
     ],
@@ -32,7 +31,6 @@ go_test(
     name = "go_default_test",
     srcs = [
         "config_test.go",
-        "dynamic_test.go",
         "flags_test.go",
     ],
     embed = [":go_default_library"],