Skip to content

Commit 40cfd1c

Browse files
ratailorratailor
committed
Integrate placement into nova-operator
This commit adds support for restructured multi-group nova-operator which includes placement-operator functionality merged into it. The nova-operator changes include: - Restructuring from single-group to multi-group operator - Moving Nova APIs to apis/nova/v1beta1/ namespace - Adding Placement APIs under apis/placement/v1beta1/ - Controllers organized under controllers/nova and controllers/placement - Complete placement-operator codebase integration including: * Placement API definitions and webhooks * Placement controller and deployment logic * Configuration templates and RBAC * Functional and KUTTL tests This enables unified management of both Nova and Placement services within in a single operator. Depends-On: openstack-k8s-operators/nova-operator#996 Commit message assisted by: claude-4-sonnet Closes: OSPRH-14957
1 parent 50fbf47 commit 40cfd1c

File tree

14 files changed

+27
-40
lines changed

14 files changed

+27
-40
lines changed

‎apis/core/v1beta1/openstackcontrolplane_types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ import (
4040
manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
4141
mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
4242
neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
43-
novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
43+
novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
4444
octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
4545
"github.com/openstack-k8s-operators/openstack-operator/apis/client/v1beta1"
4646
ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
47-
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
47+
placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1"
4848
swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
4949
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
5050
watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1"

‎apis/core/v1beta1/openstackcontrolplane_webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/openstack-k8s-operators/lib-common/modules/common/route"
2626
common_webhook "github.com/openstack-k8s-operators/lib-common/modules/common/webhook"
2727
mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
28-
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
28+
placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1"
2929
watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1"
3030
"golang.org/x/exp/maps"
3131
"golang.org/x/exp/slices"
@@ -54,7 +54,7 @@ import (
5454
ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
5555
manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
5656
neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
57-
novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
57+
novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
5858
octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
5959
swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
6060
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"

‎apis/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ require (
2121
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811082751-434506f532d6
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-8b60a24b4cd5
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2
24-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726
24+
github.com/openstack-k8s-operators/nova-operator/apis v0.0.0-20250825114858-536f2b4a2918
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f
28-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef
2928
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d
3029
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250811132820-f9e60d64606b
3130
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250814062147-d38ac9ce26f7
@@ -85,7 +84,6 @@ require (
8584
github.com/prometheus/common v0.53.0 // indirect
8685
github.com/prometheus/procfs v0.13.0 // indirect
8786
github.com/rabbitmq/cluster-operator/v2 v2.9.0 // indirect
88-
github.com/robfig/cron/v3 v3.0.1 // indirect
8987
github.com/spf13/pflag v1.0.6 // indirect
9088
golang.org/x/crypto v0.33.0 // indirect
9189
golang.org/x/net v0.34.0 // indirect

‎apis/go.sum‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,12 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-
124124
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-8b60a24b4cd5/go.mod h1:0dWVKC1svlk2h+vyJGlKDcwgq4yJaovKXBhGZNi5tQ0=
125125
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2 h1:pnvSi8qEmnHJoIVvaQ4iepaP4+9FVpz1pYmUWnFrV1g=
126126
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2/go.mod h1:9lXzkXXIlTeZ/Tm0O0tAwjhvHnOY0Y451MWQMzvUvik=
127-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726 h1:6UebstSWM0rBRTeCk2R505GuKebO/24kd9dRkHT58KI=
128-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726/go.mod h1:q2yWzcUnY7TJjJnpC7cds5f/c/9um6p2HV6rMWJMBhM=
129127
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494 h1:duVVlu8m77wLrz5z8tb5ARn/yp3b3f+VstDzkjaBKlw=
130128
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494/go.mod h1:kWC1tu28WMErEU8PtMyhEUMqC1BGT0+VmMyuFTeR/Tk=
131129
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1 h1:rgZEgrgk9gRGhWdvDNEgzDgtfHp4leZaHMzya4bZXDU=
132130
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y=
133131
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f h1:p/LpkWcRpFsrUxgqw4v9iuSNJ1+dD+buPS4OAmagAOc=
134132
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f/go.mod h1:YWZ2qLvvqsgIcHQsJT9+tdC1r7OfdcNIJnJbU4Ddxj4=
135-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef h1:/z0xPP6BdaJJu/0qIH9kpuFELqiNAkp53laelyy8e6I=
136-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef/go.mod h1:8ssUFKkbxaSxMCVjCut4zz8/qZAtLgiKg3TnojFCxks=
137133
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4=
138134
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
139135
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d h1:5We3OBi/MDIKHUYjymKkkagZO3fbSq2wl/xZtO9vrYY=
@@ -159,8 +155,6 @@ github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 h1:N
159155
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1/go.mod h1:oDJbA/Byh5LNU7zBgBZYRM5263mgL16NtysHl/uVtGY=
160156
github.com/rhobs/observability-operator v0.3.1 h1:vVGCt/a7Ds5VeqikaKZJz18oOPV9p4YUaezlVlwdpIM=
161157
github.com/rhobs/observability-operator v0.3.1/go.mod h1:nC2YcqsTdm44agl9Fz5QzNSGtSFokIGUhS1g7OlzFrs=
162-
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
163-
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
164158
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
165159
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
166160
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=

‎controllers/core/openstackcontrolplane_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ import (
4141
manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
4242
mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
4343
neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
44-
novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
44+
novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
4545
octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
4646
clientv1 "github.com/openstack-k8s-operators/openstack-operator/apis/client/v1beta1"
4747
corev1beta1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1"
4848

4949
"github.com/openstack-k8s-operators/openstack-operator/pkg/openstack"
5050

5151
rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1"
52+
placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1"
5253
ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
53-
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
5454
swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
5555
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
5656
watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1"

‎go.mod‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@ require (
2929
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811082751-434506f532d6
3030
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-8b60a24b4cd5
3131
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2
32-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726
3332
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494
3433
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1
3534
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
3635
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f
37-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef
3836
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d
3937
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250811132820-f9e60d64606b
4038
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20250813095803-cef303decff5
@@ -93,7 +91,6 @@ require (
9391
github.com/prometheus/procfs v0.13.0 // indirect
9492
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
9593
github.com/rhobs/observability-operator v0.3.1 // indirect
96-
github.com/robfig/cron/v3 v3.0.1 // indirect
9794
github.com/spf13/pflag v1.0.6 // indirect
9895
go.uber.org/multierr v1.11.0 // indirect
9996
golang.org/x/crypto v0.33.0 // indirect
@@ -122,6 +119,10 @@ require (
122119

123120
replace github.com/openstack-k8s-operators/openstack-operator/apis => ./apis
124121

122+
replace github.com/openstack-k8s-operators/nova-operator/apis => ./apis
123+
124+
replace github.com/openstack-k8s-operators/placement-operator/apis => ./apis
125+
125126
// mschuppert: map to latest commit from release-4.16 tag
126127
// must consistent within modules and service operators
127128
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 //allow-merging

‎go.sum‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,12 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-
134134
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-8b60a24b4cd5/go.mod h1:0dWVKC1svlk2h+vyJGlKDcwgq4yJaovKXBhGZNi5tQ0=
135135
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2 h1:pnvSi8qEmnHJoIVvaQ4iepaP4+9FVpz1pYmUWnFrV1g=
136136
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2/go.mod h1:9lXzkXXIlTeZ/Tm0O0tAwjhvHnOY0Y451MWQMzvUvik=
137-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726 h1:6UebstSWM0rBRTeCk2R505GuKebO/24kd9dRkHT58KI=
138-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726/go.mod h1:q2yWzcUnY7TJjJnpC7cds5f/c/9um6p2HV6rMWJMBhM=
139137
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494 h1:duVVlu8m77wLrz5z8tb5ARn/yp3b3f+VstDzkjaBKlw=
140138
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494/go.mod h1:kWC1tu28WMErEU8PtMyhEUMqC1BGT0+VmMyuFTeR/Tk=
141139
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1 h1:rgZEgrgk9gRGhWdvDNEgzDgtfHp4leZaHMzya4bZXDU=
142140
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y=
143141
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f h1:p/LpkWcRpFsrUxgqw4v9iuSNJ1+dD+buPS4OAmagAOc=
144142
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f/go.mod h1:YWZ2qLvvqsgIcHQsJT9+tdC1r7OfdcNIJnJbU4Ddxj4=
145-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef h1:/z0xPP6BdaJJu/0qIH9kpuFELqiNAkp53laelyy8e6I=
146-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef/go.mod h1:8ssUFKkbxaSxMCVjCut4zz8/qZAtLgiKg3TnojFCxks=
147143
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4=
148144
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
149145
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d h1:5We3OBi/MDIKHUYjymKkkagZO3fbSq2wl/xZtO9vrYY=
@@ -171,8 +167,6 @@ github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 h1:N
171167
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1/go.mod h1:oDJbA/Byh5LNU7zBgBZYRM5263mgL16NtysHl/uVtGY=
172168
github.com/rhobs/observability-operator v0.3.1 h1:vVGCt/a7Ds5VeqikaKZJz18oOPV9p4YUaezlVlwdpIM=
173169
github.com/rhobs/observability-operator v0.3.1/go.mod h1:nC2YcqsTdm44agl9Fz5QzNSGtSFokIGUhS1g7OlzFrs=
174-
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
175-
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
176170
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
177171
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
178172
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=

‎main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ import (
4848
manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
4949
mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
5050
neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
51-
novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
51+
novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
52+
placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1"
5253
octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
5354
baremetalv1 "github.com/openstack-k8s-operators/openstack-baremetal-operator/api/v1beta1"
5455
ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
55-
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
5656
swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
5757
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
5858
watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1"

‎pkg/openstack/common.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ import (
3333
manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
3434
mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
3535
neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
36-
novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
36+
novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1"
3737
octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
3838
corev1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1"
3939

4040
// corev1 "k8s.io/api/core/v1"
41+
placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1"
4142
corev1beta1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1"
4243
ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
43-
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
4444
swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
4545
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
4646

0 commit comments

Comments
 (0)