refactor(kubeadm): remove the "alpha certs" command

cmd/kubeadm/app/cmd/BUILD

@@ -3,6 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "certs.go",
         "cmd.go",
         "completion.go",
         "config.go",
@@ -36,6 +37,8 @@ go_library(
         "//cmd/kubeadm/app/images: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/renewal:go_default_library",
+        "//cmd/kubeadm/app/phases/copycerts:go_default_library",
         "//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
         "//cmd/kubeadm/app/util:go_default_library",
         "//cmd/kubeadm/app/util/apiclient:go_default_library",
@@ -69,6 +72,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = [
+        "certs_test.go",
         "completion_test.go",
         "config_test.go",
         "init_test.go",
@@ -78,16 +82,22 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
+        "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
         "//cmd/kubeadm/app/apis/kubeadm/v1beta2:go_default_library",
         "//cmd/kubeadm/app/apis/output/scheme:go_default_library",
         "//cmd/kubeadm/app/apis/output/v1alpha1:go_default_library",
         "//cmd/kubeadm/app/cmd/options:go_default_library",
         "//cmd/kubeadm/app/constants:go_default_library",
+        "//cmd/kubeadm/app/phases/certs:go_default_library",
+        "//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
         "//cmd/kubeadm/app/util:go_default_library",
         "//cmd/kubeadm/app/util/config:go_default_library",
         "//cmd/kubeadm/app/util/kubeconfig:go_default_library",
         "//cmd/kubeadm/app/util/output:go_default_library",
+        "//cmd/kubeadm/app/util/pkiutil:go_default_library",
         "//cmd/kubeadm/app/util/runtime:go_default_library",
+        "//cmd/kubeadm/test:go_default_library",
+        "//cmd/kubeadm/test/cmd:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -99,6 +109,9 @@ go_test(
         "//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/github.com/spf13/pflag:go_default_library",
+        "//vendor/github.com/stretchr/testify/assert:go_default_library",
+        "//vendor/github.com/stretchr/testify/require:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
         "//vendor/k8s.io/utils/exec/testing:go_default_library",
         "//vendor/sigs.k8s.io/yaml:go_default_library",

cmd/kubeadm/app/cmd/alpha/BUILD

@@ -4,29 +4,17 @@ go_library(
     name = "go_default_library",
     srcs = [
         "alpha.go",
-        "certs.go",
         "kubeconfig.go",
     ],
     importpath = "k8s.io/kubernetes/cmd/kubeadm/app/cmd/alpha",
     visibility = ["//visibility:public"],
     deps = [
-        "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
-        "//cmd/kubeadm/app/apis/kubeadm/scheme:go_default_library",
         "//cmd/kubeadm/app/apis/kubeadm/v1beta2:go_default_library",
         "//cmd/kubeadm/app/cmd/options:go_default_library",
         "//cmd/kubeadm/app/cmd/util:go_default_library",
-        "//cmd/kubeadm/app/constants:go_default_library",
-        "//cmd/kubeadm/app/phases/certs:go_default_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/util/config:go_default_library",
-        "//cmd/kubeadm/app/util/kubeconfig:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/util/duration: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",
-        "//vendor/github.com/spf13/pflag:go_default_library",
     ],
 )
 
@@ -46,27 +34,16 @@ filegroup(
 
 go_test(
     name = "go_default_test",
-    srcs = [
+    srcs = ["kubeconfig_test.go"],
-        "certs_test.go",
-        "kubeconfig_test.go",
-    ],
     embed = [":go_default_library"],
     deps = [
-        "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
         "//cmd/kubeadm/app/apis/kubeadm/v1beta2:go_default_library",
         "//cmd/kubeadm/app/constants:go_default_library",
-        "//cmd/kubeadm/app/phases/certs:go_default_library",
-        "//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
         "//cmd/kubeadm/app/util/pkiutil:go_default_library",
         "//cmd/kubeadm/test:go_default_library",
-        "//cmd/kubeadm/test/cmd:go_default_library",
         "//cmd/kubeadm/test/kubeconfig:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
-        "//vendor/github.com/spf13/cobra:go_default_library",
-        "//vendor/github.com/spf13/pflag:go_default_library",
-        "//vendor/github.com/stretchr/testify/assert:go_default_library",
-        "//vendor/github.com/stretchr/testify/require:go_default_library",
         "//vendor/sigs.k8s.io/yaml:go_default_library",
     ],
 )

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

@@ -33,10 +33,6 @@ func NewCmdAlpha(in io.Reader, out io.Writer) *cobra.Command {
 	deprecateCommand(`please use the same command under "kubeadm kubeconfig"`, kubeconfigCmd)
 	cmd.AddCommand(kubeconfigCmd)
 
-	certsCommand := NewCmdCertsUtility(out)
-	deprecateCommand(`please use the same command under "kubeadm certs"`, certsCommand)
-	cmd.AddCommand(certsCommand)
-
 	return cmd
 }
 

cmd/kubeadm/app/cmd/certs.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package alpha
+package cmd
 
 import (
 	"fmt"
@@ -27,6 +27,7 @@ import (
 	"github.com/spf13/pflag"
 
 	"k8s.io/apimachinery/pkg/util/duration"
+
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
 	kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme"
 	kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2"
@@ -90,8 +91,8 @@ var (
 `)
 )
 
-// NewCmdCertsUtility returns main command for certs phase
+// newCmdCertsUtility returns main command for certs phase
-func NewCmdCertsUtility(out io.Writer) *cobra.Command {
+func newCmdCertsUtility(out io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "certs",
 		Aliases: []string{"certificates"},

cmd/kubeadm/app/cmd/certs_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 (
 	"crypto"
@@ -32,6 +32,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"k8s.io/client-go/tools/clientcmd"
+
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
 	kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2"
 	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"

cmd/kubeadm/app/cmd/cmd.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/lithammer/dedent"
 	"github.com/spf13/cobra"
+
 	"k8s.io/kubernetes/cmd/kubeadm/app/cmd/alpha"
 	"k8s.io/kubernetes/cmd/kubeadm/app/cmd/options"
 	"k8s.io/kubernetes/cmd/kubeadm/app/cmd/upgrade"
@@ -81,6 +82,7 @@ func NewKubeadmCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 
 	cmds.ResetFlags()
 
+	cmds.AddCommand(newCmdCertsUtility(out))
 	cmds.AddCommand(newCmdCompletion(out, ""))
 	cmds.AddCommand(newCmdConfig(out))
 	cmds.AddCommand(newCmdInit(out, nil))
@@ -91,10 +93,6 @@ 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 "certs" from "alpha"
-	// https://github.com/kubernetes/kubeadm/issues/2291
-	cmds.AddCommand(alpha.NewCmdCertsUtility(out))
 	// TODO: remove "kubeconfig" from "alpha"
 	// https://github.com/kubernetes/kubeadm/issues/2292
 	cmds.AddCommand(alpha.NewCmdKubeConfigUtility(out))