Skip to content

Commit f336f75

Browse files
committed
Update build configuration
Updated build configuration: - go.mod: Replace module reference from /api to /apis - Makefile: Replaced manifests, gowork, operator-lint targets to /apis - PROJECT: Updated Nova API paths to apis/nova/v1beta1, added PlacementAPI resource
1 parent 738790e commit f336f75

3 files changed

Lines changed: 26 additions & 13 deletions

File tree

Makefile

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

120120
.PHONY: generate
121121
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -359,13 +359,13 @@ golint: get-ci-tools
359359
.PHONY: operator-lint
360360
operator-lint: $(LOCALBIN) gowork ## Runs operator-lint
361361
GOBIN=$(LOCALBIN) go install github.com/gibizer/operator-lint@v0.5.0
362-
go vet -vettool=$(LOCALBIN)/operator-lint ./... ./api/...
362+
go vet -vettool=$(LOCALBIN)/operator-lint ./... ./apis/...
363363

364364
.PHONY: gowork
365365
gowork: ## Generate go.work file
366366
test -f go.work || GOTOOLCHAIN=$(GOTOOLCHAIN_VERSION) go work init
367367
go work use .
368-
go work use ./api
368+
go work use ./apis
369369
go work sync
370370

371371
OPERATOR_NAMESPACE ?= openstack-operators

PROJECT

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ resources:
1818
domain: openstack.org
1919
group: nova
2020
kind: NovaAPI
21-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
21+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
2222
version: v1beta1
2323
webhooks:
2424
defaulting: true
@@ -31,7 +31,7 @@ resources:
3131
domain: openstack.org
3232
group: nova
3333
kind: NovaScheduler
34-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
34+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
3535
version: v1beta1
3636
webhooks:
3737
defaulting: true
@@ -44,7 +44,7 @@ resources:
4444
domain: openstack.org
4545
group: nova
4646
kind: NovaConductor
47-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
47+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
4848
version: v1beta1
4949
webhooks:
5050
defaulting: true
@@ -57,7 +57,7 @@ resources:
5757
domain: openstack.org
5858
group: nova
5959
kind: NovaMetadata
60-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
60+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
6161
version: v1beta1
6262
webhooks:
6363
defaulting: true
@@ -70,7 +70,7 @@ resources:
7070
domain: openstack.org
7171
group: nova
7272
kind: NovaNoVNCProxy
73-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
73+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
7474
version: v1beta1
7575
webhooks:
7676
defaulting: true
@@ -83,7 +83,7 @@ resources:
8383
domain: openstack.org
8484
group: nova
8585
kind: NovaCell
86-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
86+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
8787
version: v1beta1
8888
webhooks:
8989
defaulting: true
@@ -96,7 +96,7 @@ resources:
9696
domain: openstack.org
9797
group: nova
9898
kind: Nova
99-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
99+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
100100
version: v1beta1
101101
webhooks:
102102
defaulting: true
@@ -109,7 +109,20 @@ resources:
109109
domain: openstack.org
110110
group: nova
111111
kind: NovaCompute
112-
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
112+
path: github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1
113+
version: v1beta1
114+
webhooks:
115+
defaulting: true
116+
validation: true
117+
webhookVersion: v1
118+
- api:
119+
crdVersion: v1
120+
namespaced: true
121+
controller: true
122+
domain: openstack.org
123+
group: placement
124+
kind: PlacementAPI
125+
path: github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1
113126
version: v1beta1
114127
webhooks:
115128
defaulting: true

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260128142552-e2c25eccae5a
1717
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20260128142552-e2c25eccae5a
1818
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260120155328-e04f52e73f01
19-
github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20221209164002-f9e6b9363961
19+
github.com/openstack-k8s-operators/nova-operator/apis v0.0.0-20221209164002-f9e6b9363961
2020
go.uber.org/zap v1.27.1
2121
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
2222
gopkg.in/ini.v1 v1.67.0
@@ -117,7 +117,7 @@ require (
117117
sigs.k8s.io/yaml v1.6.0 // indirect
118118
)
119119

120-
replace github.com/openstack-k8s-operators/nova-operator/api => ./api
120+
replace github.com/openstack-k8s-operators/nova-operator/apis => ./apis
121121

122122
// mschuppert: map to latest commit from release-4.18 tag
123123
// must consistent within modules and service operators

0 commit comments

Comments
 (0)