Skip to content

Commit 189c2dc

Browse files
ratailorratailor
committed
Migrate nova-operator from single to multi-group
This change migrate nova-operator from single group operator to support multi-group operators, which is required to merge placement-operator code base from placement-operator into nova-operator. Related: OSPRH-14957
1 parent 144e0f9 commit 189c2dc

File tree

67 files changed

+74
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+74
-69
lines changed

‎Makefile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
113113
.PHONY: manifests
114114
manifests: gowork controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
115115
$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases && \
116-
rm -f api/bases/* && cp -a config/crd/bases api/
116+
rm -f apis/bases/* && cp -a config/crd/bases apis/
117117

118118
.PHONY: generate
119119
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -126,13 +126,13 @@ fmt: ## Run go fmt against code.
126126
.PHONY: vet
127127
vet: gowork ## Run go vet against code.
128128
go vet ./...
129-
go vet ./api/...
129+
go vet ./apis/...
130130

131131

132132
.PHONY: tidy
133133
tidy: ## Run go mod tidy on every mod file in the repo
134134
go mod tidy
135-
cd ./api && go mod tidy
135+
cd ./apis && go mod tidy
136136

137137
.PHONY: golangci-lint
138138
golangci-lint:
@@ -147,7 +147,7 @@ PROC_CMD = --procs ${PROCS}
147147
test: manifests generate fmt vet envtest ginkgo ## Run tests.
148148
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) -v debug --bin-dir $(LOCALBIN) use $(ENVTEST_K8S_VERSION) -p path)" \
149149
OPERATOR_TEMPLATES="$(PWD)/templates" \
150-
$(GINKGO) --trace --cover --coverpkg=../../pkg/...,../../controllers,../../api/v1beta1 --coverprofile cover.out --covermode=atomic --randomize-all ${PROC_CMD} $(GINKGO_ARGS) ./test/...
150+
$(GINKGO) --trace --cover --coverpkg=../../pkg/...,../../controllers,../../apis/nova/v1beta1 --coverprofile cover.out --covermode=atomic --randomize-all ${PROC_CMD} $(GINKGO_ARGS) ./test/...
151151

152152
##@ Build
153153

@@ -332,36 +332,36 @@ get-ci-tools:
332332
# Run go fmt against code
333333
gofmt: get-ci-tools
334334
$(CI_TOOLS_REPO_DIR)/test-runner/gofmt.sh
335-
$(CI_TOOLS_REPO_DIR)/test-runner/gofmt.sh ./api
335+
$(CI_TOOLS_REPO_DIR)/test-runner/gofmt.sh ./apis
336336

337337
# Run go vet against code
338338
govet: get-ci-tools
339339
GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/govet.sh
340-
GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/govet.sh ./api
340+
GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/govet.sh ./apis
341341

342342
# Run go test against code
343343
gotest: test
344344

345345
# Run golangci-lint test against code
346346
golangci: get-ci-tools
347347
GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/golangci.sh
348-
GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/golangci.sh ./api
348+
GOWORK=off $(CI_TOOLS_REPO_DIR)/test-runner/golangci.sh ./apis
349349

350350
# Run go lint against code
351351
golint: get-ci-tools
352352
export GOWORK=off && PATH=$(GOBIN):$(PATH); $(CI_TOOLS_REPO_DIR)/test-runner/golint.sh
353-
export GOWORK=off && PATH=$(GOBIN):$(PATH); $(CI_TOOLS_REPO_DIR)/test-runner/golint.sh ./api
353+
export GOWORK=off && PATH=$(GOBIN):$(PATH); $(CI_TOOLS_REPO_DIR)/test-runner/golint.sh ./apis
354354

355355
.PHONY: operator-lint
356356
operator-lint: $(LOCALBIN) gowork ## Runs operator-lint
357357
GOBIN=$(LOCALBIN) go install github.com/gibizer/operator-lint@v0.5.0
358-
go vet -vettool=$(LOCALBIN)/operator-lint ./... ./api/...
358+
go vet -vettool=$(LOCALBIN)/operator-lint ./... ./apis/...
359359

360360
.PHONY: gowork
361361
gowork: ## Generate go.work file
362362
test -f go.work || GOTOOLCHAIN=$(GOTOOLCHAIN_VERSION) go work init
363363
go work use .
364-
go work use ./api
364+
go work use ./apis
365365
go work sync
366366

367367
OPERATOR_NAMESPACE ?= openstack-operators
@@ -429,8 +429,8 @@ force-bump: ## Force bump operator and lib-common dependencies
429429
for dep in $$(cat go.mod | grep openstack-k8s-operators | grep -vE -- 'indirect|nova-operator|^replace' | awk '{print $$1}'); do \
430430
go get $$dep@$(BRANCH) ; \
431431
done
432-
for dep in $$(cat api/go.mod | grep openstack-k8s-operators | grep -vE -- 'indirect|nova-operator|^replace' | awk '{print $$1}'); do \
433-
cd ./api && go get $$dep@$(BRANCH) && cd .. ; \
432+
for dep in $$(cat apis/go.mod | grep openstack-k8s-operators | grep -vE -- 'indirect|nova-operator|^replace' | awk '{print $$1}'); do \
433+
cd ./apis && go get $$dep@$(BRANCH) && cd .. ; \
434434
done
435435

436436
PHONY: crd-schema-check

‎PROJECT‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
# Code generated by tool. DO NOT EDIT.
2+
# This file is used to track the info used to scaffold your project
3+
# and allow the plugins properly work.
4+
# More info: https://book.kubebuilder.io/reference/project-config.html
15
domain: openstack.org
26
layout:
37
- go.kubebuilder.io/v3
8+
multigroup: true
49
plugins:
510
manifests.sdk.operatorframework.io/v2: {}
611
scorecard.sdk.operatorframework.io/v2: {}
@@ -14,7 +19,7 @@ resources:
1419
domain: openstack.org
1520
group: nova
1621
kind: NovaAPI
17-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
22+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
1823
version: v1beta1
1924
webhooks:
2025
defaulting: true
@@ -27,7 +32,7 @@ resources:
2732
domain: openstack.org
2833
group: nova
2934
kind: NovaScheduler
30-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
35+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
3136
version: v1beta1
3237
webhooks:
3338
defaulting: true
@@ -40,7 +45,7 @@ resources:
4045
domain: openstack.org
4146
group: nova
4247
kind: NovaConductor
43-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
48+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
4449
version: v1beta1
4550
webhooks:
4651
defaulting: true
@@ -53,7 +58,7 @@ resources:
5358
domain: openstack.org
5459
group: nova
5560
kind: NovaMetadata
56-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
61+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
5762
version: v1beta1
5863
webhooks:
5964
defaulting: true
@@ -66,7 +71,7 @@ resources:
6671
domain: openstack.org
6772
group: nova
6873
kind: NovaNoVNCProxy
69-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
74+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
7075
version: v1beta1
7176
webhooks:
7277
defaulting: true
@@ -79,7 +84,7 @@ resources:
7984
domain: openstack.org
8085
group: nova
8186
kind: NovaCell
82-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
87+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
8388
version: v1beta1
8489
webhooks:
8590
defaulting: true
@@ -92,7 +97,7 @@ resources:
9297
domain: openstack.org
9398
group: nova
9499
kind: Nova
95-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
100+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
96101
version: v1beta1
97102
webhooks:
98103
defaulting: true
@@ -105,7 +110,7 @@ resources:
105110
domain: openstack.org
106111
group: nova
107112
kind: NovaCompute
108-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
113+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
109114
version: v1beta1
110115
webhooks:
111116
defaulting: true

api/bases/nova.openstack.org_nova.yaml renamed to apis/bases/nova.openstack.org_nova.yaml

File renamed without changes.

api/bases/nova.openstack.org_novaapis.yaml renamed to apis/bases/nova.openstack.org_novaapis.yaml

File renamed without changes.

api/bases/nova.openstack.org_novacells.yaml renamed to apis/bases/nova.openstack.org_novacells.yaml

File renamed without changes.

api/bases/nova.openstack.org_novacomputes.yaml renamed to apis/bases/nova.openstack.org_novacomputes.yaml

File renamed without changes.

api/bases/nova.openstack.org_novaconductors.yaml renamed to apis/bases/nova.openstack.org_novaconductors.yaml

File renamed without changes.

api/bases/nova.openstack.org_novametadata.yaml renamed to apis/bases/nova.openstack.org_novametadata.yaml

File renamed without changes.

api/bases/nova.openstack.org_novanovncproxies.yaml renamed to apis/bases/nova.openstack.org_novanovncproxies.yaml

File renamed without changes.

api/bases/nova.openstack.org_novaschedulers.yaml renamed to apis/bases/nova.openstack.org_novaschedulers.yaml

File renamed without changes.

0 commit comments

Comments
 (0)