fix: any layout should keep api/ as dir

docs/book/src/migration/multi-group.md

@@ -32,8 +32,8 @@ Then, we'll rename `api` to `apis` to be more clear, and we'll move our
 existing APIs into a new subdirectory, "batch":
 
 ```bash
-mkdir apis/batch
-mv api/* apis/batch
+mkdir api/batch
+mv api/* api/batch
 # After ensuring that all was moved successfully remove the old directory `api/`
 rm -rf api/ 
 ```
@@ -72,7 +72,7 @@ Note that this option indicates to KubeBuilder that this is a multi-group projec
 
 In this way, if the project is not new and has previous APIs already implemented will be in the previous structure. 
 Notice that with the `multi-group` project the Kind API's files are
-created under `apis/<group>/<version>` instead of `api/<version>`. 
+created under `api/<group>/<version>` instead of `api/<version>`. 
 Also, note that the controllers will be created under `controllers/<group>` instead of `controllers`. 
 That is the reason why we moved the previously generated APIs with the provided scripts in the previous steps. 
 Remember to update the references afterwards.

docs/testing/integration.md

@@ -11,9 +11,9 @@ package parent
 import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	childapis "k8s.io/child/pkg/apis"
-	childv1alpha1 "k8s.io/childrepo/pkg/apis/child/v1alpha1"
+	childv1alpha1 "k8s.io/childrepo/pkg/api/child/v1alpha1"
 	parentapis "k8s.io/parent/pkg/apis"
-	parentv1alpha1 "k8s.io/parentrepo/pkg/apis/parent/v1alpha1"
+	parentv1alpha1 "k8s.io/parentrepo/pkg/api/parent/v1alpha1"
 
 	...<other import items>...
 )

docs/using_an_external_type.md

@@ -60,13 +60,13 @@ kubebuilder create api --group mygroup --version $APIVERSION --kind MyKind
 
 Edit the following file to the pkg/apis directory to append their `AddToScheme` to your `AddToSchemes`:
 
-file: pkg/apis/mytype_addtoscheme.go
+file: pkg/api/mytype_addtoscheme.go
 ```
 package apis
 
 import (
-	mygroupv1alpha1 "github.com/myuser/myrepo/apis/mygroup/v1alpha1"
-	theirgroupv1alpha1 "github.com/theiruser/theirproject/apis/theirgroup/v1alpha1"
+	mygroupv1alpha1 "github.com/myuser/myrepo/api/mygroup/v1alpha1"
+	theirgroupv1alpha1 "github.com/theiruser/theirproject/api/theirgroup/v1alpha1"
 )
 
 func init() {
@@ -88,8 +88,8 @@ func init() {
 file: pkg/controllers/mytype_controller.go
 ```
 import (
-	mygroupv1alpha1 "github.com/myuser/myrepo/apis/mygroup/v1alpha1"
-	theirgroupv1alpha1 "github.com/theiruser/theirproject/apis/theirgroup/v1alpha1"
+	mygroupv1alpha1 "github.com/myuser/myrepo/api/mygroup/v1alpha1"
+	theirgroupv1alpha1 "github.com/theiruser/theirproject/api/theirgroup/v1alpha1"
 )
 ```
 

pkg/model/resource/options.go

@@ -167,7 +167,7 @@ func (opts *Options) NewResource(c *config.Config, doResource bool) *Resource {
 
 	pkg := replacer.Replace(path.Join(c.Repo, "api", "%[version]"))
 	if c.MultiGroup {
-		pkg = replacer.Replace(path.Join(c.Repo, "apis", "%[group]", "%[version]"))
+		pkg = replacer.Replace(path.Join(c.Repo, "api", "%[group]", "%[version]"))
 	}
 	domain := c.Domain
 

pkg/model/resource/resource_test.go

@@ -66,7 +66,7 @@ var _ = Describe("Resource", func() {
 			Expect(resource.Kind).To(Equal(options.Kind))
 			Expect(resource.Plural).To(Equal("firstmates"))
 			Expect(resource.ImportAlias).To(Equal("crewv1"))
-			Expect(resource.Package).To(Equal(path.Join("test", "apis", "crew", "v1")))
+			Expect(resource.Package).To(Equal(path.Join("test", "api", "crew", "v1")))
 			Expect(resource.Domain).To(Equal("crew.test.io"))
 		})
 
@@ -156,7 +156,7 @@ var _ = Describe("Resource", func() {
 			Expect(resource.Group).To(Equal(options.Group))
 			Expect(resource.GroupPackageName).To(Equal("myproject"))
 			Expect(resource.ImportAlias).To(Equal("myprojectv1"))
-			Expect(resource.Package).To(Equal(path.Join("test", "apis", "my-project", "v1")))
+			Expect(resource.Package).To(Equal(path.Join("test", "api", "my-project", "v1")))
 			Expect(resource.Domain).To(Equal("my-project.test.io"))
 
 			options = &Options{Group: "my.project", Version: "v1", Kind: "FirstMate"}
@@ -173,7 +173,7 @@ var _ = Describe("Resource", func() {
 			Expect(resource.Group).To(Equal(options.Group))
 			Expect(resource.GroupPackageName).To(Equal("myproject"))
 			Expect(resource.ImportAlias).To(Equal("myprojectv1"))
-			Expect(resource.Package).To(Equal(path.Join("test", "apis", "my.project", "v1")))
+			Expect(resource.Package).To(Equal(path.Join("test", "api", "my.project", "v1")))
 			Expect(resource.Domain).To(Equal("my.project.test.io"))
 		})
 

pkg/scaffold/internal/templates/group.go

@@ -36,7 +36,7 @@ type Group struct {
 func (f *Group) SetTemplateDefaults() error {
 	if f.Path == "" {
 		if f.MultiGroup {
-			f.Path = filepath.Join("apis", "%[group]", "%[version]", "groupversion_info.go")
+			f.Path = filepath.Join("api", "%[group]", "%[version]", "groupversion_info.go")
 		} else {
 			f.Path = filepath.Join("api", "%[version]", "groupversion_info.go")
 		}

pkg/scaffold/internal/templates/types.go

@@ -37,7 +37,7 @@ type Types struct {
 func (f *Types) SetTemplateDefaults() error {
 	if f.Path == "" {
 		if f.MultiGroup {
-			f.Path = filepath.Join("apis", "%[group]", "%[version]", "%[kind]_types.go")
+			f.Path = filepath.Join("api", "%[group]", "%[version]", "%[kind]_types.go")
 		} else {
 			f.Path = filepath.Join("api", "%[version]", "%[kind]_types.go")
 		}

pkg/scaffold/internal/templates/webhook/webhook.go

@@ -46,7 +46,7 @@ type Webhook struct { // nolint:maligned
 func (f *Webhook) SetTemplateDefaults() error {
 	if f.Path == "" {
 		if f.MultiGroup {
-			f.Path = filepath.Join("apis", "%[group]", "%[version]", "%[kind]_webhook.go")
+			f.Path = filepath.Join("api", "%[group]", "%[version]", "%[kind]_webhook.go")
 		} else {
 			f.Path = filepath.Join("api", "%[version]", "%[kind]_webhook.go")
 		}

plugins/addon/type.go

@@ -21,7 +21,7 @@ func ReplaceTypes(u *model.Universe) error {
 
 	var path string
 	if u.Config.MultiGroup {
-		path = filepath.Join("apis", u.Resource.Version, strings.ToLower(u.Resource.Kind)+"_types.go")
+		path = filepath.Join("api", u.Resource.Version, strings.ToLower(u.Resource.Kind)+"_types.go")
 	} else {
 		path = filepath.Join("api", u.Resource.Version, strings.ToLower(u.Resource.Kind)+"_types.go")
 	}

test/e2e/utils/test_context.go

@@ -160,6 +160,15 @@ func (kc *KBTestContext) CreateAPI(resourceOptions ...string) error {
 	return err
 }
 
+
+// Edit is for running `kubebuilder edit`
+func (kc *KBTestContext) Edit(editOptions ...string) error {
+	editOptions = append([]string{"edit"}, editOptions...)
+	cmd := exec.Command("kubebuilder", editOptions...)
+	_, err := kc.Run(cmd)
+	return err
+}
+
 // CreateWebhook is for running `kubebuilder create webhook`
 func (kc *KBTestContext) CreateWebhook(resourceOptions ...string) error {
 	resourceOptions = append([]string{"create", "webhook"}, resourceOptions...)