Merge pull request #1983 from Adirio/remove-post-scaffold-make

✨ Remove make calls from post-scaffold hooks

Author: k8s-ci-robot

pkg/plugins/golang/v2/api.go

@@ -91,7 +91,7 @@ After the scaffold is written, api will run make on the project.
 }
 
 func (p *createAPISubcommand) BindFlags(fs *pflag.FlagSet) {
-	fs.BoolVar(&p.runMake, "make", true, "if true, run make after generating files")
+	fs.BoolVar(&p.runMake, "make", true, "if true, run `make generate` after generating files")
 
 	if os.Getenv("KUBEBUILDER_ENABLE_PLUGINS") != "" {
 		fs.StringVar(&p.pattern, "pattern", "",
@@ -198,8 +198,8 @@ func (p *createAPISubcommand) PostScaffold() error {
 		return fmt.Errorf("unknown pattern %q", p.pattern)
 	}
 
-	if p.runMake {
-		return util.RunCmd("Running make", "make")
+	if p.runMake { // TODO: check if API was scaffolded
+		return util.RunCmd("Running make", "make", "generate")
 	}
 	return nil
 }

pkg/plugins/golang/v2/init.go

@@ -183,11 +183,6 @@ func (p *initSubcommand) PostScaffold() error {
 		return err
 	}
 
-	err = util.RunCmd("Running make", "make")
-	if err != nil {
-		return err
-	}
-
 	fmt.Printf("Next: define a resource with:\n$ %s create api\n", p.commandName)
 	return nil
 }

pkg/plugins/golang/v3/api.go

@@ -105,7 +105,7 @@ After the scaffold is written, api will run make on the project.
 }
 
 func (p *createAPISubcommand) BindFlags(fs *pflag.FlagSet) {
-	fs.BoolVar(&p.runMake, "make", true, "if true, run make after generating files")
+	fs.BoolVar(&p.runMake, "make", true, "if true, run `make generate` after generating files")
 
 	// TODO: remove this when a better solution for using addons is implemented.
 	if os.Getenv("KUBEBUILDER_ENABLE_PLUGINS") != "" {
@@ -232,8 +232,8 @@ func (p *createAPISubcommand) PostScaffold() error {
 		return fmt.Errorf("unknown pattern %q", p.pattern)
 	}
 
-	if p.runMake {
-		return util.RunCmd("Running make", "make")
+	if p.runMake { // TODO: check if API was scaffolded
+		return util.RunCmd("Running make", "make", "generate")
 	}
 	return nil
 }

pkg/plugins/golang/v3/init.go

@@ -185,12 +185,6 @@ func (p *initSubcommand) PostScaffold() error {
 		return err
 	}
 
-	// TODO: make this conditional with a '--make' flag, like in 'create api'.
-	err = util.RunCmd("Running make", "make")
-	if err != nil {
-		return err
-	}
-
 	fmt.Printf("Next: define a resource with:\n$ %s create api\n", p.commandName)
 	return nil
 }

pkg/plugins/golang/v3/webhook.go

@@ -29,7 +29,6 @@ import (
 	goPlugin "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/internal/cmdutil"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/internal/util"
 )
 
 // defaultWebhookVersion is the default mutating/validating webhook config API version to scaffold.
@@ -44,9 +43,6 @@ type createWebhookSubcommand struct {
 
 	// force indicates that the resource should be created even if it already exists
 	force bool
-
-	// runMake indicates whether to run make or not after scaffolding webhooks
-	runMake bool
 }
 
 var (
@@ -87,7 +83,6 @@ func (p *createWebhookSubcommand) BindFlags(fs *pflag.FlagSet) {
 	fs.BoolVar(&p.options.DoConversion, "conversion", false,
 		"if set, scaffold the conversion webhook")
 
-	fs.BoolVar(&p.runMake, "make", true, "if true, run make after generating files")
 	fs.BoolVar(&p.force, "force", false,
 		"attempt to create resource even if it already exists")
 }
@@ -139,8 +134,5 @@ func (p *createWebhookSubcommand) GetScaffolder() (cmdutil.Scaffolder, error) {
 }
 
 func (p *createWebhookSubcommand) PostScaffold() error {
-	if p.runMake {
-		return util.RunCmd("Running make", "make")
-	}
 	return nil
 }