fix: migrate apis directory to api per standard (#6646)

redhatrises · web-flow · commit c557c5410472 · 2024-01-09T09:14:57.000-05:00
- When multigroup is true, the api directory is now used instead of apis.

Signed-off-by: Gabe Alford &lt;redhatrises@gmail.com&gt;
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
 }
diff --git a/testdata/go/v3/memcached-operator/Makefile b/testdata/go/v3/memcached-operator/Makefile
@@ -48,7 +48,7 @@ endif
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.32.0
+OPERATOR_SDK_VERSION ?= v1.33.0
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
diff --git a/testdata/go/v3/monitoring/memcached-operator/Makefile b/testdata/go/v3/monitoring/memcached-operator/Makefile
@@ -48,7 +48,7 @@ endif
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.32.0
+OPERATOR_SDK_VERSION ?= v1.33.0
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
diff --git a/testdata/go/v4/memcached-operator/Makefile b/testdata/go/v4/memcached-operator/Makefile
@@ -48,7 +48,7 @@ endif
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.32.0
+OPERATOR_SDK_VERSION ?= v1.33.0
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
diff --git a/testdata/go/v4/monitoring/memcached-operator/Makefile b/testdata/go/v4/monitoring/memcached-operator/Makefile
@@ -48,7 +48,7 @@ endif
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.32.0
+OPERATOR_SDK_VERSION ?= v1.33.0
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
diff --git a/testdata/helm/memcached-operator/Makefile b/testdata/helm/memcached-operator/Makefile
@@ -48,7 +48,7 @@ endif
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.32.0
+OPERATOR_SDK_VERSION ?= v1.33.0
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func convertConfig3AlphaTo3(cfgBytes []byte) (_ []byte, err error) {`
`93`	`93`	`// Only Go projects use "resources[*].path".`
`94`	`94`	`var apiPath string`
`95`	`95`	`if isMultigroup {`
`96`		`- apiPath = path.Join("apis", resources[i].Group, resources[i].Version)`
	`96`	`+ apiPath = path.Join("api", resources[i].Group, resources[i].Version)`
`97`	`97`	`} else {`
`98`	`98`	`apiPath = path.Join("api", resources[i].Version)`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,11 +156,7 @@ func (c *manifestsCmd) setDefaults(cfg config.Config) error {`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`if c.apisDir == "" {`
`159`		`- if cfg.IsMultiGroup() {`
`160`		`- c.apisDir = "apis"`
`161`		`- } else {`
`162`		`- c.apisDir = "api"`
`163`		`- }`
	`159`	`+ c.apisDir = "api"`
`164`	`160`	`}`
`165`	`161`	`return nil`
`166`	`162`	`}`