Add multigroup structure to apis

Move controllers to multigroup struct, refactor some testing
k8ssandra · Oct 6, 2021 · ff6e362 · ff6e362
1 parent fd20fcf
commit ff6e362
Show file tree

Hide file tree

Showing 60 changed files with 1,664 additions and 1,329 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ RUN go mod download
 
 # Copy the go source
 COPY main.go main.go
-COPY api/ api/
+COPY apis/ apis/
 COPY pkg/ pkg/
 COPY controllers/ controllers/
 

diff --git a/Makefile b/Makefile
@@ -105,9 +105,9 @@ ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
 test: manifests generate fmt vet envtest ## Run tests.
 ifdef TEST
 	@echo Running test $(TEST)
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test $(GO_FLAGS) ./api/... ./pkg/... ./controllers/... -run="$(TEST)" -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test $(GO_FLAGS) ./apis/... ./pkg/... ./controllers/... -run="$(TEST)" -coverprofile cover.out
 else
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test $(GO_FLAGS) ./api/... ./pkg/... ./controllers/... -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test $(GO_FLAGS) ./apis/... ./pkg/... ./controllers/... -coverprofile cover.out
 endif
 
 PHONY: e2e-test

diff --git a/PROJECT b/PROJECT
@@ -1,6 +1,7 @@
 domain: k8ssandra.io
 layout:
 - go.kubebuilder.io/v3
+multigroup: true
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
@@ -13,29 +14,31 @@ resources:
   controller: true
   group: k8ssandra.io
   kind: K8ssandraCluster
-  path: github.com/k8ssandra/k8ssandra-operator/api/v1alpha1
+  path: github.com/k8ssandra/k8ssandra-operator/apis/core/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   domain: k8ssandra.io
+  group: stargate
   kind: Stargate
-  version: ""
+  path: github.com/k8ssandra/k8ssandra-operator/apis/stargate/v1alpha1
+  version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   domain: k8ssandra.io
-  group: k8ssandra.io
+  group: config
   kind: ClientConfig
-  path: github.com/k8ssandra/k8ssandra-operator/api/v1alpha1
-  version: v1alpha1
+  path: github.com/k8ssandra/k8ssandra-operator/apis/config/v1beta1
+  version: v1beta1
 - api:
     crdVersion: v1
     namespaced: true
   domain: k8ssandra.io
-  group: k8ssandra.io
+  group: replication
   kind: ReplicatedSecret
-  path: github.com/k8ssandra/k8ssandra-operator/api/v1alpha1
+  path: github.com/k8ssandra/k8ssandra-operator/apis/replication/v1alpha1
   version: v1alpha1
 version: "3"