Merge pull request #3278 from camilamacedo86/ensure-default

✨ : make go/v4 to be default Kubebuilder CLI scaffold
kubernetes-sigs · Mar 13, 2023 · 99e275d · 99e275d
2 parents 3e8df57 + c58b3f1
commit 99e275d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -75,7 +75,7 @@ func main() {
 		),
 		cli.WithPlugins(externalPlugins...),
 		cli.WithDefaultPlugins(cfgv2.Version, golangv2.Plugin{}),
-		cli.WithDefaultPlugins(cfgv3.Version, gov3Bundle),
+		cli.WithDefaultPlugins(cfgv3.Version, gov4Bundle),
 		cli.WithDefaultProjectVersion(cfgv3.Version),
 		cli.WithCompletion(),
 	)

diff --git a/docs/book/src/quick-start.md b/docs/book/src/quick-start.md
@@ -53,19 +53,6 @@ Kubebuilder provides autocompletion support for Bash and Zsh via the command `ku
 
 Create a directory, and then run the init command inside of it to initialize a new project. Follows an example.
 
-<aside class="note warning">
-<h1> Apple Silicon (M1) </h1>
-
-The current scaffold done by the CLI (`go/v3`) uses [kubernetes-sigs/kustomize][kustomize] v3 which does not provide
-a valid binary for Apple Silicon (`darwin/arm64`). Therefore, you can use the `go/v4` plugin
-instead which provides support for this platform:
-
-```bash
-kubebuilder init --domain my.domain --repo my.domain/guestbook --plugins=go/v4
-```
-
-</aside>
-
 ```bash
 mkdir -p ~/projects/guestbook
 cd ~/projects/guestbook

diff --git a/hack/docs/internal/generate_component_config.go b/hack/docs/internal/generate_component_config.go
@@ -73,6 +73,7 @@ func (sp *Sample) GenerateSampleProject() {
 		"--license", "apache2",
 		"--owner", "The Kubernetes authors",
 		"--component-config",
+		"--plugins=go/v3",
 	)
 	CheckError("Initializing the project", err)