Merge pull request kubernetes#87944 from SataQiu/kubeadm-2020020802

kubeadm: remove 'kubeadm alpha kubelet config download'

Author: k8s-ci-robot

cmd/kubeadm/app/cmd/alpha/BUILD

@@ -26,7 +26,6 @@ go_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/preflight: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",
@@ -35,7 +34,6 @@ go_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",
-        "//vendor/k8s.io/utils/exec:go_default_library",
     ],
 )
 

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

@@ -26,26 +26,10 @@ import (
 	cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util"
 	"k8s.io/kubernetes/cmd/kubeadm/app/constants"
 	kubeletphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubelet"
-	"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
 	kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
-	utilsexec "k8s.io/utils/exec"
 )
 
 var (
-	kubeletConfigDownloadLongDesc = cmdutil.LongDesc(`
-		Download the kubelet configuration from a ConfigMap of the form "kubelet-config-1.X" in the cluster,
-		where X is the minor version of the kubelet. Either kubeadm autodetects the kubelet version by exec-ing
-		"kubelet --version" or respects the --kubelet-version parameter.
-		` + cmdutil.AlphaDisclaimer)
-
-	kubeletConfigDownloadExample = cmdutil.Examples(fmt.Sprintf(`
-		# Download the kubelet configuration from the ConfigMap in the cluster. Autodetect the kubelet version.
-		kubeadm alpha kubelet config download
-
-		# Download the kubelet configuration from the ConfigMap in the cluster. Use a specific desired kubelet version.
-		kubeadm alpha kubelet config download --kubelet-version %s
-		`, constants.CurrentKubernetesVersion))
-
 	kubeletConfigEnableDynamicLongDesc = cmdutil.LongDesc(`
 		Enable or update dynamic kubelet configuration for a Node, against the kubelet-config-1.X ConfigMap in the cluster,
 		where X is the minor version of the desired kubelet version.
@@ -84,49 +68,10 @@ func newCmdKubeletConfig() *cobra.Command {
 		Long:  cmdutil.MacroCommandLongDescription,
 	}
 
-	cmd.AddCommand(newCmdKubeletConfigDownload())
 	cmd.AddCommand(newCmdKubeletConfigEnableDynamic())
 	return cmd
 }
 
-// newCmdKubeletConfigDownload calls cobra.Command for downloading the kubelet configuration from the kubelet-config-1.X ConfigMap in the cluster
-func newCmdKubeletConfigDownload() *cobra.Command {
-	var kubeletVersionStr string
-	// TODO: Be smarter about this and be able to load multiple kubeconfig files in different orders of precedence
-	kubeConfigFile := constants.GetKubeletKubeConfigPath()
-
-	cmd := &cobra.Command{
-		Use:     "download",
-		Short:   "Download the kubelet configuration from the cluster ConfigMap kubelet-config-1.X, where X is the minor version of the kubelet",
-		Long:    kubeletConfigDownloadLongDesc,
-		Example: kubeletConfigDownloadExample,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			kubeletVersion, err := getKubeletVersion(kubeletVersionStr)
-			if err != nil {
-				return err
-			}
-
-			client, err := kubeconfigutil.ClientSetFromFile(kubeConfigFile)
-			if err != nil {
-				return err
-			}
-
-			return kubeletphase.DownloadConfig(client, kubeletVersion, constants.KubeletRunDirectory)
-		},
-	}
-
-	options.AddKubeConfigFlag(cmd.Flags(), &kubeConfigFile)
-	cmd.Flags().StringVar(&kubeletVersionStr, "kubelet-version", kubeletVersionStr, "The desired version for the kubelet. Defaults to being autodetected from 'kubelet --version'.")
-	return cmd
-}
-
-func getKubeletVersion(kubeletVersionStr string) (*version.Version, error) {
-	if len(kubeletVersionStr) > 0 {
-		return version.ParseSemantic(kubeletVersionStr)
-	}
-	return preflight.GetKubeletVersion(utilsexec.New())
-}
-
 // newCmdKubeletConfigEnableDynamic calls cobra.Command for enabling dynamic kubelet configuration on node
 // This feature is still in alpha and an experimental state
 func newCmdKubeletConfigEnableDynamic() *cobra.Command {