diff --git a/apis/core/v1beta1/openstackcontrolplane_types.go b/apis/core/v1beta1/openstackcontrolplane_types.go index c4431f1d8..30be65457 100644 --- a/apis/core/v1beta1/openstackcontrolplane_types.go +++ b/apis/core/v1beta1/openstackcontrolplane_types.go @@ -40,11 +40,11 @@ import ( manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1" mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1" neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1" - novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1" + novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1" octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" "github.com/openstack-k8s-operators/openstack-operator/apis/client/v1beta1" ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1" - placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1" swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1" telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1" watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1" diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go index ec3670044..ad724a8c4 100644 --- a/apis/core/v1beta1/openstackcontrolplane_webhook.go +++ b/apis/core/v1beta1/openstackcontrolplane_webhook.go @@ -25,7 +25,7 @@ import ( "github.com/openstack-k8s-operators/lib-common/modules/common/route" common_webhook "github.com/openstack-k8s-operators/lib-common/modules/common/webhook" mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1" - placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1" watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1" "golang.org/x/exp/maps" "golang.org/x/exp/slices" @@ -54,7 +54,7 @@ import ( ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1" manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1" neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1" - novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1" + novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1" octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1" telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1" diff --git a/apis/core/v1beta1/zz_generated.deepcopy.go b/apis/core/v1beta1/zz_generated.deepcopy.go index 1c6212861..2aa5263f4 100644 --- a/apis/core/v1beta1/zz_generated.deepcopy.go +++ b/apis/core/v1beta1/zz_generated.deepcopy.go @@ -40,10 +40,10 @@ import ( manila_operatorapiv1beta1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1" mariadb_operatorapiv1beta1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1" neutron_operatorapiv1beta1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1" - nova_operatorapiv1beta1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1" + novav1beta1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1" + placementv1beta1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1" octavia_operatorapiv1beta1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" ovn_operatorapiv1beta1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1" - placement_operatorapiv1beta1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1" swift_operatorapiv1beta1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1" telemetry_operatorapiv1beta1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1" watcher_operatorapiv1beta1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1" @@ -1041,7 +1041,7 @@ func (in *NovaSection) DeepCopyInto(out *NovaSection) { *out = *in if in.Template != nil { in, out := &in.Template, &out.Template - *out = new(nova_operatorapiv1beta1.NovaSpecCore) + *out = new(novav1beta1.NovaSpecCore) (*in).DeepCopyInto(*out) } in.APIOverride.DeepCopyInto(&out.APIOverride) @@ -1504,7 +1504,7 @@ func (in *PlacementSection) DeepCopyInto(out *PlacementSection) { *out = *in if in.Template != nil { in, out := &in.Template, &out.Template - *out = new(placement_operatorapiv1beta1.PlacementAPISpecCore) + *out = new(placementv1beta1.PlacementAPISpecCore) (*in).DeepCopyInto(*out) } in.APIOverride.DeepCopyInto(&out.APIOverride) diff --git a/apis/go.mod b/apis/go.mod index 7649b7311..7803fbdde 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -21,11 +21,10 @@ require ( github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811082751-434506f532d6 github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-8b60a24b4cd5 github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2 - github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726 + github.com/openstack-k8s-operators/nova-operator/apis v0.6.1-0.20250811132528-e890fbdf8726 github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1 github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f - github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250811132820-f9e60d64606b github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250814062147-d38ac9ce26f7 @@ -110,6 +109,8 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) +replace github.com/openstack-k8s-operators/nova-operator/apis => github.com/ratailor/nova-operator/apis v0.0.0-20250825101302-a422847a4bfb //allow-merging + // mschuppert: map to latest commit from release-4.16 tag // must consistent within modules and service operators replace github.com/openshift/api => github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 //allow-merging diff --git a/apis/go.sum b/apis/go.sum index 6be46435a..18a106190 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -124,16 +124,12 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527- github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-8b60a24b4cd5/go.mod h1:0dWVKC1svlk2h+vyJGlKDcwgq4yJaovKXBhGZNi5tQ0= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2 h1:pnvSi8qEmnHJoIVvaQ4iepaP4+9FVpz1pYmUWnFrV1g= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2/go.mod h1:9lXzkXXIlTeZ/Tm0O0tAwjhvHnOY0Y451MWQMzvUvik= -github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726 h1:6UebstSWM0rBRTeCk2R505GuKebO/24kd9dRkHT58KI= -github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726/go.mod h1:q2yWzcUnY7TJjJnpC7cds5f/c/9um6p2HV6rMWJMBhM= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494 h1:duVVlu8m77wLrz5z8tb5ARn/yp3b3f+VstDzkjaBKlw= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494/go.mod h1:kWC1tu28WMErEU8PtMyhEUMqC1BGT0+VmMyuFTeR/Tk= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1 h1:rgZEgrgk9gRGhWdvDNEgzDgtfHp4leZaHMzya4bZXDU= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f h1:p/LpkWcRpFsrUxgqw4v9iuSNJ1+dD+buPS4OAmagAOc= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f/go.mod h1:YWZ2qLvvqsgIcHQsJT9+tdC1r7OfdcNIJnJbU4Ddxj4= -github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef h1:/z0xPP6BdaJJu/0qIH9kpuFELqiNAkp53laelyy8e6I= -github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef/go.mod h1:8ssUFKkbxaSxMCVjCut4zz8/qZAtLgiKg3TnojFCxks= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg= github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d h1:5We3OBi/MDIKHUYjymKkkagZO3fbSq2wl/xZtO9vrYY= @@ -155,6 +151,8 @@ github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+a github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= +github.com/ratailor/nova-operator/apis v0.0.0-20250825101302-a422847a4bfb h1:JnkJWl4/WeP73qPup8dXXCuXfATbDcP+9Q37Ckmuw7k= +github.com/ratailor/nova-operator/apis v0.0.0-20250825101302-a422847a4bfb/go.mod h1:HpUxnpgLZe+UuqFRc4SdfWvTYTXej+kU7Ms/BP4eRhc= github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 h1:NBdZFQUVKllUnmh6suuH02+K8VS8ibErnOhxNiH+aio= github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1/go.mod h1:oDJbA/Byh5LNU7zBgBZYRM5263mgL16NtysHl/uVtGY= github.com/rhobs/observability-operator v0.3.1 h1:vVGCt/a7Ds5VeqikaKZJz18oOPV9p4YUaezlVlwdpIM= diff --git a/controllers/core/openstackcontrolplane_controller.go b/controllers/core/openstackcontrolplane_controller.go index fd11b90c2..12565f7d0 100644 --- a/controllers/core/openstackcontrolplane_controller.go +++ b/controllers/core/openstackcontrolplane_controller.go @@ -41,7 +41,7 @@ import ( manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1" mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1" neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1" - novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1" + novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1" octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" clientv1 "github.com/openstack-k8s-operators/openstack-operator/apis/client/v1beta1" corev1beta1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" @@ -49,8 +49,8 @@ import ( "github.com/openstack-k8s-operators/openstack-operator/pkg/openstack" rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1" ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1" - placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1" swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1" telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1" watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1" diff --git a/go.mod b/go.mod index 5b2245a02..3e2edff76 100644 --- a/go.mod +++ b/go.mod @@ -29,12 +29,11 @@ require ( github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811082751-434506f532d6 github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-8b60a24b4cd5 github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2 - github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726 + github.com/openstack-k8s-operators/nova-operator/apis v0.6.1-0.20250811132528-e890fbdf8726 github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1 github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f - github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250811132820-f9e60d64606b github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20250813095803-cef303decff5 @@ -122,6 +121,8 @@ require ( replace github.com/openstack-k8s-operators/openstack-operator/apis => ./apis +replace github.com/openstack-k8s-operators/nova-operator/apis => github.com/ratailor/nova-operator/apis v0.0.0-20250825101302-a422847a4bfb //allow-merging + // mschuppert: map to latest commit from release-4.16 tag // must consistent within modules and service operators replace github.com/openshift/api => github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 //allow-merging diff --git a/go.sum b/go.sum index efccc4700..3fe684ecb 100644 --- a/go.sum +++ b/go.sum @@ -134,16 +134,12 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527- github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-8b60a24b4cd5/go.mod h1:0dWVKC1svlk2h+vyJGlKDcwgq4yJaovKXBhGZNi5tQ0= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2 h1:pnvSi8qEmnHJoIVvaQ4iepaP4+9FVpz1pYmUWnFrV1g= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250811081638-ad2aa6263eb2/go.mod h1:9lXzkXXIlTeZ/Tm0O0tAwjhvHnOY0Y451MWQMzvUvik= -github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726 h1:6UebstSWM0rBRTeCk2R505GuKebO/24kd9dRkHT58KI= -github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726/go.mod h1:q2yWzcUnY7TJjJnpC7cds5f/c/9um6p2HV6rMWJMBhM= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494 h1:duVVlu8m77wLrz5z8tb5ARn/yp3b3f+VstDzkjaBKlw= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494/go.mod h1:kWC1tu28WMErEU8PtMyhEUMqC1BGT0+VmMyuFTeR/Tk= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1 h1:rgZEgrgk9gRGhWdvDNEgzDgtfHp4leZaHMzya4bZXDU= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f h1:p/LpkWcRpFsrUxgqw4v9iuSNJ1+dD+buPS4OAmagAOc= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f/go.mod h1:YWZ2qLvvqsgIcHQsJT9+tdC1r7OfdcNIJnJbU4Ddxj4= -github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef h1:/z0xPP6BdaJJu/0qIH9kpuFELqiNAkp53laelyy8e6I= -github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef/go.mod h1:8ssUFKkbxaSxMCVjCut4zz8/qZAtLgiKg3TnojFCxks= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg= github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d h1:5We3OBi/MDIKHUYjymKkkagZO3fbSq2wl/xZtO9vrYY= @@ -167,6 +163,8 @@ github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+a github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= +github.com/ratailor/nova-operator/apis v0.0.0-20250825101302-a422847a4bfb h1:JnkJWl4/WeP73qPup8dXXCuXfATbDcP+9Q37Ckmuw7k= +github.com/ratailor/nova-operator/apis v0.0.0-20250825101302-a422847a4bfb/go.mod h1:HpUxnpgLZe+UuqFRc4SdfWvTYTXej+kU7Ms/BP4eRhc= github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 h1:NBdZFQUVKllUnmh6suuH02+K8VS8ibErnOhxNiH+aio= github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1/go.mod h1:oDJbA/Byh5LNU7zBgBZYRM5263mgL16NtysHl/uVtGY= github.com/rhobs/observability-operator v0.3.1 h1:vVGCt/a7Ds5VeqikaKZJz18oOPV9p4YUaezlVlwdpIM= diff --git a/main.go b/main.go index e58784c9d..3960e4a85 100644 --- a/main.go +++ b/main.go @@ -48,11 +48,11 @@ import ( manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1" mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1" neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1" - novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1" + novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1" octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" baremetalv1 "github.com/openstack-k8s-operators/openstack-baremetal-operator/api/v1beta1" ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1" - placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1" swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1" telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1" watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1" diff --git a/pkg/openstack/common.go b/pkg/openstack/common.go index 87c21f768..b78707c9c 100644 --- a/pkg/openstack/common.go +++ b/pkg/openstack/common.go @@ -33,14 +33,14 @@ import ( manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1" mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1" neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1" - novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1" + novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1" octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" corev1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" // corev1 "k8s.io/api/core/v1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1" corev1beta1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1" - placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1" swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1" telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1" diff --git a/pkg/openstack/nova.go b/pkg/openstack/nova.go index 60df6b4fe..9e7b04c25 100644 --- a/pkg/openstack/nova.go +++ b/pkg/openstack/nova.go @@ -31,7 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" certmgrv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" - novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1" + novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1" corev1beta1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" k8s_errors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/openstack/placement.go b/pkg/openstack/placement.go index b48025a05..542b42982 100644 --- a/pkg/openstack/placement.go +++ b/pkg/openstack/placement.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1" corev1beta1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" - placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1" k8s_errors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/tests/functional/ctlplane/openstackoperator_controller_test.go b/tests/functional/ctlplane/openstackoperator_controller_test.go index 7f4b41c0b..ab4a65b87 100644 --- a/tests/functional/ctlplane/openstackoperator_controller_test.go +++ b/tests/functional/ctlplane/openstackoperator_controller_test.go @@ -47,11 +47,11 @@ import ( "github.com/openstack-k8s-operators/lib-common/modules/common/service" "github.com/openstack-k8s-operators/lib-common/modules/common/tls" manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1" - novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1" + novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1" clientv1 "github.com/openstack-k8s-operators/openstack-operator/apis/client/v1beta1" corev1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1" - placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1" watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1" ) diff --git a/tests/functional/ctlplane/suite_test.go b/tests/functional/ctlplane/suite_test.go index 333123a44..98d3fd1cb 100644 --- a/tests/functional/ctlplane/suite_test.go +++ b/tests/functional/ctlplane/suite_test.go @@ -46,7 +46,8 @@ import ( manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1" mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1" neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1" - novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1" + novav1 "github.com/openstack-k8s-operators/nova-operator/apis/nova/v1beta1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/apis/placement/v1beta1" octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" openstackclientv1 "github.com/openstack-k8s-operators/openstack-operator/apis/client/v1beta1" corev1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" @@ -54,7 +55,6 @@ import ( lightspeedv1 "github.com/openstack-k8s-operators/openstack-operator/apis/lightspeed/v1beta1" "github.com/openstack-k8s-operators/openstack-operator/pkg/openstack" ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1" - placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1" swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1" telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1" watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1" @@ -152,7 +152,7 @@ var _ = BeforeSuite(func() { "github.com/openstack-k8s-operators/neutron-operator/api", gomod, "bases") Expect(err).ShouldNot(HaveOccurred()) novav1CRDs, err := test.GetCRDDirFromModule( - "github.com/openstack-k8s-operators/nova-operator/api", gomod, "bases") + "github.com/openstack-k8s-operators/nova-operator/apis", gomod, "bases") Expect(err).ShouldNot(HaveOccurred()) octaviav1CRDs, err := test.GetCRDDirFromModule( "github.com/openstack-k8s-operators/octavia-operator/api", gomod, "bases") @@ -161,7 +161,7 @@ var _ = BeforeSuite(func() { "github.com/openstack-k8s-operators/ovn-operator/api", gomod, "bases") Expect(err).ShouldNot(HaveOccurred()) placementv1CRDs, err := test.GetCRDDirFromModule( - "github.com/openstack-k8s-operators/placement-operator/api", gomod, "bases") + "github.com/openstack-k8s-operators/nova-operator/apis", gomod, "bases") Expect(err).ShouldNot(HaveOccurred()) swiftv1CRDs, err := test.GetCRDDirFromModule( "github.com/openstack-k8s-operators/swift-operator/api", gomod, "bases")