Enhance plugin resolution algorithm

Signed-off-by: Adrian Orive <[email protected]>
kubernetes-sigs · Feb 17, 2021 · 643333e · 643333e
1 parent bee2b1a
commit 643333e
Show file tree

Hide file tree

Showing 12 changed files with 499 additions and 875 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -20,7 +20,6 @@ import (
 	"log"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/cli"
-	cfgv2 "sigs.k8s.io/kubebuilder/v3/pkg/config/v2"
 	cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3"
 	declarativev1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/declarative/v1"
 	pluginv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v2"
@@ -31,14 +30,13 @@ func main() {
 	c, err := cli.New(
 		cli.WithCommandName("kubebuilder"),
 		cli.WithVersion(versionString()),
-		cli.WithDefaultProjectVersion(cfgv3.Version),
 		cli.WithPlugins(
 			&pluginv2.Plugin{},
 			&pluginv3.Plugin{},
 			&declarativev1.Plugin{},
 		),
-		cli.WithDefaultPlugins(cfgv2.Version, &pluginv2.Plugin{}),
-		cli.WithDefaultPlugins(cfgv3.Version, &pluginv3.Plugin{}),
+		cli.WithDefaultPlugins(&pluginv3.Plugin{}),
+		cli.WithDefaultProjectVersion(cfgv3.Version),
 		cli.WithCompletion,
 	)
 	if err != nil {