Refactor cli package

kubernetes-sigs · Nov 18, 2020 · 2177510 · 2177510
1 parent 5a78c19
commit 2177510
Show file tree

Hide file tree

Showing 19 changed files with 1,077 additions and 814 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -20,6 +20,7 @@ import (
 	"log"
 
 	"sigs.k8s.io/kubebuilder/v2/pkg/cli"
+	"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
 	pluginv2 "sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2"
 	pluginv3 "sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3"
 )
@@ -28,11 +29,15 @@ func main() {
 	c, err := cli.New(
 		cli.WithCommandName("kubebuilder"),
 		cli.WithVersion(versionString()),
+		cli.WithDefaultProjectVersion(config.Version2),
 		cli.WithPlugins(
 			&pluginv2.Plugin{},
 			&pluginv3.Plugin{},
 		),
-		cli.WithDefaultPlugins(
+		cli.WithDefaultPlugins(config.Version2,
+			&pluginv2.Plugin{},
+		),
+		cli.WithDefaultPlugins(config.Version3Alpha,
 			&pluginv2.Plugin{},
 		),
 		cli.WithCompletion,

diff --git a/pkg/cli/api.go b/pkg/cli/api.go
@@ -25,7 +25,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
 )
 
-func (c *cli) newCreateAPICmd() *cobra.Command {
+func (c cli) newCreateAPICmd() *cobra.Command {
 	ctx := c.newAPIContext()
 	cmd := &cobra.Command{
 		Use:     "api",
@@ -43,15 +43,11 @@ func (c *cli) newCreateAPICmd() *cobra.Command {
 }
 
 func (c cli) newAPIContext() plugin.Context {
-	ctx := plugin.Context{
+	return plugin.Context{
 		CommandName: c.commandName,
 		Description: `Scaffold a Kubernetes API.
 `,
 	}
-	if !c.configured {
-		ctx.Description = fmt.Sprintf("%s\n%s", ctx.Description, runInProjectRootMsg)
-	}
-	return ctx
 }
 
 // nolint:dupl