From 41c4cccc26a40451e128a0f9e28f5b1d553b82e5 Mon Sep 17 00:00:00 2001
From: Jian Zeng <zengjian.zj@bytedance.com>
Date: Wed, 12 May 2021 22:04:03 +0800
Subject: [PATCH] refactor(kubeadm): remove deprecated command `alpha
 kubeconfig`

Signed-off-by: Jian Zeng <zengjian.zj@bytedance.com>
---
 cmd/kubeadm/app/cmd/alpha/alpha.go                 | 14 --------------
 cmd/kubeadm/app/cmd/cmd.go                         |  4 +---
 cmd/kubeadm/app/cmd/{alpha => }/kubeconfig.go      | 12 ++++++------
 cmd/kubeadm/app/cmd/{alpha => }/kubeconfig_test.go |  2 +-
 4 files changed, 8 insertions(+), 24 deletions(-)
 rename cmd/kubeadm/app/cmd/{alpha => }/kubeconfig.go (93%)
 rename cmd/kubeadm/app/cmd/{alpha => }/kubeconfig_test.go (99%)

diff --git a/cmd/kubeadm/app/cmd/alpha/alpha.go b/cmd/kubeadm/app/cmd/alpha/alpha.go
index 7df99bb3d1d..ea1a9294a4a 100644
--- a/cmd/kubeadm/app/cmd/alpha/alpha.go
+++ b/cmd/kubeadm/app/cmd/alpha/alpha.go
@@ -29,19 +29,5 @@ func NewCmdAlpha(in io.Reader, out io.Writer) *cobra.Command {
 		Short: "Kubeadm experimental sub-commands",
 	}
 
-	kubeconfigCmd := NewCmdKubeConfigUtility(out)
-	deprecateCommand(`please use the same command under "kubeadm kubeconfig"`, kubeconfigCmd)
-	cmd.AddCommand(kubeconfigCmd)
-
 	return cmd
 }
-
-func deprecateCommand(msg string, cmds ...*cobra.Command) {
-	for _, cmd := range cmds {
-		cmd.Deprecated = msg
-		childCmds := cmd.Commands()
-		if len(childCmds) > 0 {
-			deprecateCommand(msg, childCmds...)
-		}
-	}
-}
diff --git a/cmd/kubeadm/app/cmd/cmd.go b/cmd/kubeadm/app/cmd/cmd.go
index f1db1d4b0f8..c2e6fa90a25 100644
--- a/cmd/kubeadm/app/cmd/cmd.go
+++ b/cmd/kubeadm/app/cmd/cmd.go
@@ -93,9 +93,7 @@ func NewKubeadmCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 	cmds.AddCommand(upgrade.NewCmdUpgrade(out))
 	cmds.AddCommand(alpha.NewCmdAlpha(in, out))
 	options.AddKubeadmOtherFlags(cmds.PersistentFlags(), &rootfsPath)
-	// TODO: remove "kubeconfig" from "alpha"
-	// https://github.com/kubernetes/kubeadm/issues/2292
-	cmds.AddCommand(alpha.NewCmdKubeConfigUtility(out))
+	cmds.AddCommand(newCmdKubeConfigUtility(out))
 
 	return cmds
 }
diff --git a/cmd/kubeadm/app/cmd/alpha/kubeconfig.go b/cmd/kubeadm/app/cmd/kubeconfig.go
similarity index 93%
rename from cmd/kubeadm/app/cmd/alpha/kubeconfig.go
rename to cmd/kubeadm/app/cmd/kubeconfig.go
index 9cb2331c240..d0c0b384904 100644
--- a/cmd/kubeadm/app/cmd/alpha/kubeconfig.go
+++ b/cmd/kubeadm/app/cmd/kubeconfig.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package alpha
+package cmd
 
 import (
 	"io"
@@ -34,20 +34,20 @@ import (
 var (
 	kubeconfigLongDesc = cmdutil.LongDesc(`
 	Kubeconfig file utilities.
-	` + cmdutil.AlphaDisclaimer)
+	`)
 
 	userKubeconfigLongDesc = cmdutil.LongDesc(`
 	Output a kubeconfig file for an additional user.
-	` + cmdutil.AlphaDisclaimer)
+	`)
 
 	userKubeconfigExample = cmdutil.Examples(`
 	# Output a kubeconfig file for an additional user named foo using a kubeadm config file bar
-	kubeadm alpha kubeconfig user --client-name=foo --config=bar
+	kubeadm kubeconfig user --client-name=foo --config=bar
 	`)
 )
 
-// NewCmdKubeConfigUtility returns main command for kubeconfig phase
-func NewCmdKubeConfigUtility(out io.Writer) *cobra.Command {
+// newCmdKubeConfigUtility returns main command for kubeconfig phase
+func newCmdKubeConfigUtility(out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "kubeconfig",
 		Short: "Kubeconfig file utilities",
diff --git a/cmd/kubeadm/app/cmd/alpha/kubeconfig_test.go b/cmd/kubeadm/app/cmd/kubeconfig_test.go
similarity index 99%
rename from cmd/kubeadm/app/cmd/alpha/kubeconfig_test.go
rename to cmd/kubeadm/app/cmd/kubeconfig_test.go
index f6d68516a32..adb5d91dc5b 100644
--- a/cmd/kubeadm/app/cmd/alpha/kubeconfig_test.go
+++ b/cmd/kubeadm/app/cmd/kubeconfig_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package alpha
+package cmd
 
 import (
 	"bytes"