Migrate nova-operator from single to multi-group

.github/workflows/lints.yaml

@@ -11,4 +11,4 @@ jobs:
         uses: actions/checkout@v2
       - name: check for replace lines in go.mod files
         run: |
-          ! egrep --invert-match -e '^replace.*/api => \./api|^replace.*//allow-merging$'  `find . -name 'go.mod'` | egrep -e 'go.mod:replace'
+          ! egrep --invert-match -e '^replace.*/apis => \./apis|^replace.*//allow-merging$'  `find . -name 'go.mod'` | egrep -e 'go.mod:replace'

Makefile

@@ -113,7 +113,7 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
 .PHONY: manifests
 manifests: gowork controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases && \
- 	rm -f api/bases/* && cp -a config/crd/bases api/
+	rm -f apis/bases/* && cp -a config/crd/bases apis/
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -126,13 +126,13 @@ fmt: ## Run go fmt against code.
 .PHONY: vet
 vet: gowork ## Run go vet against code.
 	go vet ./...
-	go vet ./api/...
+	go vet ./apis/...
 
 
 .PHONY: tidy
 tidy: ## Run go mod tidy on every mod file in the repo
 	go mod tidy
-	cd ./api && go mod tidy
+	cd ./apis && go mod tidy
 
 .PHONY: golangci-lint
 golangci-lint:
@@ -147,7 +147,7 @@ PROC_CMD = --procs ${PROCS}
 test: manifests generate fmt vet envtest ginkgo ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) -v debug --bin-dir $(LOCALBIN) use $(ENVTEST_K8S_VERSION) -p path)" \
 	OPERATOR_TEMPLATES="$(PWD)/templates" \
-	$(GINKGO) --trace --cover --coverpkg=../../pkg/...,../../controllers,../../api/v1beta1 --coverprofile cover.out --covermode=atomic --randomize-all ${PROC_CMD} $(GINKGO_ARGS) ./test/...
+	$(GINKGO) --trace --cover --coverpkg=../../pkg/...,../../controllers,../../apis/nova/v1beta1 --coverprofile cover.out --covermode=atomic --randomize-all ${PROC_CMD} $(GINKGO_ARGS) ./test/...
 
 ##@ Build
 
@@ -333,36 +333,36 @@ get-ci-tools:
 # Run go fmt against code
 gofmt: get-ci-tools
 	$(CI_TOOLS_REPO_DIR)/test-runner/gofmt.sh
-	$(CI_TOOLS_REPO_DIR)/test-runner/gofmt.sh ./api
+	$(CI_TOOLS_REPO_DIR)/test-runner/gofmt.sh ./apis
 
 # Run go vet against code
 govet: get-ci-tools
 	GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/govet.sh
-	GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/govet.sh ./api
+	GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/govet.sh ./apis
 
 # Run go test against code
 gotest: test
 
 # Run golangci-lint test against code
 golangci: get-ci-tools
 	GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/golangci.sh
-	GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/golangci.sh ./api
+	GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/golangci.sh ./apis
 
 # Run go lint against code
 golint: get-ci-tools
 	export GOWORK=off && PATH=$(GOBIN):$(PATH); $(CI_TOOLS_REPO_DIR)/test-runner/golint.sh
-	export GOWORK=off && PATH=$(GOBIN):$(PATH); $(CI_TOOLS_REPO_DIR)/test-runner/golint.sh ./api
+	export GOWORK=off && PATH=$(GOBIN):$(PATH); $(CI_TOOLS_REPO_DIR)/test-runner/golint.sh ./apis
 
 .PHONY: operator-lint
 operator-lint: $(LOCALBIN) gowork ## Runs operator-lint
 	GOBIN=$(LOCALBIN) go install github.com/gibizer/[email protected]
-	go vet -vettool=$(LOCALBIN)/operator-lint ./... ./api/...
+	go vet -vettool=$(LOCALBIN)/operator-lint ./... ./apis/...
 
 .PHONY: gowork
 gowork: ## Generate go.work file
 	test -f go.work || GOTOOLCHAIN=$(GOTOOLCHAIN_VERSION) go work init
 	go work use .
-	go work use ./api
+	go work use ./apis
 	go work sync
 
 OPERATOR_NAMESPACE ?= openstack-operators
@@ -431,8 +431,8 @@ force-bump: ## Force bump operator and lib-common dependencies
 	for dep in $$(cat go.mod | grep openstack-k8s-operators | grep -vE -- 'indirect|nova-operator|^replace' | awk '{print $$1}'); do \
 		go get $$dep@$(BRANCH) ; \
 	done
-	for dep in $$(cat api/go.mod | grep openstack-k8s-operators | grep -vE -- 'indirect|nova-operator|^replace' | awk '{print $$1}'); do \
-		cd ./api && go get $$dep@$(BRANCH) && cd .. ; \
+	for dep in $$(cat apis/go.mod | grep openstack-k8s-operators | grep -vE -- 'indirect|nova-operator|^replace' | awk '{print $$1}'); do \
+		cd ./apis && go get $$dep@$(BRANCH) && cd .. ; \
 	done
 
 PHONY: crd-schema-check

PROJECT

@@ -1,6 +1,11 @@
+# Code generated by tool. DO NOT EDIT.
+# This file is used to track the info used to scaffold your project
+# and allow the plugins properly work.
+# More info: https://book.kubebuilder.io/reference/project-config.html
 domain: openstack.org
 layout:
 - go.kubebuilder.io/v3
+multigroup: true
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
@@ -14,7 +19,7 @@ resources:
   domain: openstack.org
   group: nova
   kind: NovaAPI
-  path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
+  path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true
@@ -27,7 +32,7 @@ resources:
   domain: openstack.org
   group: nova
   kind: NovaScheduler
-  path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
+  path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true
@@ -40,7 +45,7 @@ resources:
   domain: openstack.org
   group: nova
   kind: NovaConductor
-  path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
+  path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true
@@ -53,7 +58,7 @@ resources:
   domain: openstack.org
   group: nova
   kind: NovaMetadata
-  path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
+  path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true
@@ -66,7 +71,7 @@ resources:
   domain: openstack.org
   group: nova
   kind: NovaNoVNCProxy
-  path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
+  path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true
@@ -79,7 +84,7 @@ resources:
   domain: openstack.org
   group: nova
   kind: NovaCell
-  path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
+  path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true
@@ -92,7 +97,7 @@ resources:
   domain: openstack.org
   group: nova
   kind: Nova
-  path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
+  path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true
@@ -105,7 +110,7 @@ resources:
   domain: openstack.org
   group: nova
   kind: NovaCompute
-  path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
+  path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true

api/go.mod → apis/go.mod

@@ -1,4 +1,4 @@
-module github.com/openstack-k8s-operators/nova-operator/api
+module github.com/openstack-k8s-operators/nova-operator/apis
 
 go 1.21
 

config/crd/kustomization.yaml

@@ -15,24 +15,24 @@ resources:
 patches:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
-#- path: patches/webhook_in_novaapis.yaml
-#- path: patches/webhook_in_novaschedulers.yaml
-#- path: patches/webhook_in_novaconductors.yaml
-#- path: patches/webhook_in_novametadata.yaml
-#- path: patches/webhook_in_novanovncproxies.yaml
-#- path: patches/webhook_in_novacells.yaml
-#- path: patches/webhook_in_nova.yaml
+#- path: patches/webhook_in_nova_novaapis.yaml
+#- path: patches/webhook_in_nova_novaschedulers.yaml
+#- path: patches/webhook_in_nova_novaconductors.yaml
+#- path: patches/webhook_in_nova_novametadata.yaml
+#- path: patches/webhook_in_nova_novanovncproxies.yaml
+#- path: patches/webhook_in_nova_novacells.yaml
+#- path: patches/webhook_in_nova_nova.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
-#- path: patches/cainjection_in_novaapis.yaml
-#- path: patches/cainjection_in_novaschedulers.yaml
-#- path: patches/cainjection_in_novaconductors.yaml
-#- path: patches/cainjection_in_novametadata.yaml
-#- path: patches/cainjection_in_novanovncproxies.yaml
-#- path: patches/cainjection_in_novacells.yaml
-#- path: patches/cainjection_in_nova.yaml
+#- path: patches/cainjection_in_nova_novaapis.yaml
+#- path: patches/cainjection_in_nova_novaschedulers.yaml
+#- path: patches/cainjection_in_nova_novaconductors.yaml
+#- path: patches/cainjection_in_nova_novametadata.yaml
+#- path: patches/cainjection_in_nova_novanovncproxies.yaml
+#- path: patches/cainjection_in_nova_novacells.yaml
+#- path: patches/cainjection_in_nova_nova.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

controllers/common.go → controllers/nova/common.go

@@ -37,7 +37,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/nova"
 
 	gophercloud "github.com/gophercloud/gophercloud"

controllers/nova_controller.go → controllers/nova/nova_controller.go

@@ -53,7 +53,7 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/nova"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/novaapi"
 

controllers/novaapi_controller.go → controllers/nova/novaapi_controller.go

@@ -52,7 +52,7 @@ import (
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/nova"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/novaapi"
 

controllers/novacell_controller.go → controllers/nova/novacell_controller.go

@@ -46,7 +46,7 @@ import (
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 )
 
 // NovaCellReconciler reconciles a NovaCell object

controllers/novacompute_controller.go → controllers/nova/novacompute_controller.go

@@ -46,7 +46,7 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/nova"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/novacompute"
 

controllers/novaconductor_controller.go → controllers/nova/novaconductor_controller.go

@@ -53,7 +53,7 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/novaconductor"
 )
 

controllers/novametadata_controller.go → controllers/nova/novametadata_controller.go

@@ -52,7 +52,7 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/nova"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/novametadata"
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"

controllers/novanovncproxy_controller.go → controllers/nova/novanovncproxy_controller.go

@@ -50,7 +50,7 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/nova"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/novncproxy"
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"

controllers/novascheduler_controller.go → controllers/nova/novascheduler_controller.go

@@ -51,7 +51,7 @@ import (
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/nova"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/novascheduler"
 )

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250730071847-837b07f8d72f
 	github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250730071847-837b07f8d72f
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-8b60a24b4cd5
-	github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20221209164002-f9e6b9363961
+	github.com/openstack-k8s-operators/nova-operator/apis v0.0.0-20221209164002-f9e6b9363961
 	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	gopkg.in/yaml.v3 v3.0.1
@@ -85,7 +85,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/openstack-k8s-operators/nova-operator/api => ./api
+replace github.com/openstack-k8s-operators/nova-operator/apis => ./apis
 
 // mschuppert: map to latest commit from release-4.16 tag
 // must consistent within modules and service operators

main.go

@@ -51,9 +51,9 @@ import (
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 
-	"github.com/openstack-k8s-operators/nova-operator/controllers"
+	nova_ctrl "github.com/openstack-k8s-operators/nova-operator/controllers/nova"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -145,7 +145,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	reconcilers := controllers.NewReconcilers(mgr, kclient)
+	reconcilers := nova_ctrl.NewReconcilers(mgr, kclient)
 	err = reconcilers.Setup(mgr, setupLog)
 	if err != nil {
 		os.Exit(1)

pkg/nova/celldelete.go

@@ -7,7 +7,7 @@ import (
 	"k8s.io/utils/ptr"
 
 	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 )
 
 func CellDeleteJob(

pkg/nova/cellmapping.go

@@ -7,7 +7,7 @@ import (
 	"k8s.io/utils/ptr"
 
 	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 )
 
 func CellMappingJob(

pkg/nova/host_discover.go

@@ -16,7 +16,7 @@ package nova
 
 import (
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"

pkg/novaapi/deployment.go

@@ -24,7 +24,7 @@ import (
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/nova"
 
 	appsv1 "k8s.io/api/apps/v1"

pkg/novacompute/deployment.go

@@ -20,7 +20,7 @@ import (
 	common "github.com/openstack-k8s-operators/lib-common/modules/common"
 	affinity "github.com/openstack-k8s-operators/lib-common/modules/common/affinity"
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/nova"
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"

pkg/novaconductor/dbpurge.go

@@ -11,7 +11,7 @@ import (
 
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/pkg/nova"
 )