Skip to content

Commit 0e8d279

Browse files
committed
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 <[email protected]>
1 parent 5429668 commit 0e8d279

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

internal/cmd/operator-sdk/alpha/config3alphato3/convert_config_3-alpha_to_3.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func convertConfig3AlphaTo3(cfgBytes []byte) (_ []byte, err error) {
9393
// Only Go projects use "resources[*].path".
9494
var apiPath string
9595
if isMultigroup {
96-
apiPath = path.Join("apis", resources[i].Group, resources[i].Version)
96+
apiPath = path.Join("api", resources[i].Group, resources[i].Version)
9797
} else {
9898
apiPath = path.Join("api", resources[i].Version)
9999
}

internal/cmd/operator-sdk/generate/kustomize/manifests.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,7 @@ func (c *manifestsCmd) setDefaults(cfg config.Config) error {
156156
}
157157

158158
if c.apisDir == "" {
159-
if cfg.IsMultiGroup() {
160-
c.apisDir = "apis"
161-
} else {
162-
c.apisDir = "api"
163-
}
159+
c.apisDir = "api"
164160
}
165161
return nil
166162
}

0 commit comments

Comments
 (0)