fix: migrate apis directory to api per standard

- When multigroup is true, the api directory is now used instead of apis. Signed-off-by: Gabe Alford <redhatrises@gmail.com>
operator-framework · Dec 20, 2023 · 0e8d279 · 0e8d279
1 parent 5429668
commit 0e8d279
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/internal/cmd/operator-sdk/alpha/config3alphato3/convert_config_3-alpha_to_3.go b/internal/cmd/operator-sdk/alpha/config3alphato3/convert_config_3-alpha_to_3.go
@@ -93,7 +93,7 @@ func convertConfig3AlphaTo3(cfgBytes []byte) (_ []byte, err error) {
 				// Only Go projects use "resources[*].path".
 				var apiPath string
 				if isMultigroup {
-					apiPath = path.Join("apis", resources[i].Group, resources[i].Version)
+					apiPath = path.Join("api", resources[i].Group, resources[i].Version)
 				} else {
 					apiPath = path.Join("api", resources[i].Version)
 				}

diff --git a/internal/cmd/operator-sdk/generate/kustomize/manifests.go b/internal/cmd/operator-sdk/generate/kustomize/manifests.go
@@ -156,11 +156,7 @@ func (c *manifestsCmd) setDefaults(cfg config.Config) error {
 	}
 
 	if c.apisDir == "" {
-		if cfg.IsMultiGroup() {
-			c.apisDir = "apis"
-		} else {
-			c.apisDir = "api"
-		}
+		c.apisDir = "api"
 	}
 	return nil
 }