From c557c5410472dcee533f09995f7a6c35ab01fe30 Mon Sep 17 00:00:00 2001 From: Gabe Alford Date: Tue, 9 Jan 2024 07:14:57 -0700 Subject: [PATCH] fix: migrate apis directory to api per standard (#6646) - When multigroup is true, the api directory is now used instead of apis. Signed-off-by: Gabe Alford --- .../alpha/config3alphato3/convert_config_3-alpha_to_3.go | 2 +- internal/cmd/operator-sdk/generate/kustomize/manifests.go | 6 +----- testdata/go/v3/memcached-operator/Makefile | 2 +- testdata/go/v3/monitoring/memcached-operator/Makefile | 2 +- testdata/go/v4/memcached-operator/Makefile | 2 +- testdata/go/v4/monitoring/memcached-operator/Makefile | 2 +- testdata/helm/memcached-operator/Makefile | 2 +- 7 files changed, 7 insertions(+), 11 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 index 442c75fcf44..98b5a7a236f 100644 --- 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 index 50897b0eeaf..659150077dd 100644 --- 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 index add3bcc5910..f1b3e24b37c 100644 --- 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 index 8b6d3d44a1a..934901a27d3 100644 --- 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 index 16b60a2f0c2..20b38386916 100644 --- 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 index 83f75a12b6f..d1a3a87e32e 100644 --- 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 index 04f02bb09a9..4d14e9a5f7e 100644 --- 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