Skip to content

Commit 55df25d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1863 from auniyal61/update-nova-operator-imports
 Update nova-operator imports to multi-group structure
2 parents bfc90a6 + 4136805 commit 55df25d

17 files changed

+20
-20
lines changed

‎api/core/v1beta1/openstackcontrolplane_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ 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/api/nova/v1beta1"
4444
octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
4545
"github.com/openstack-k8s-operators/openstack-operator/api/client/v1beta1"
4646
ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"

‎api/core/v1beta1/openstackcontrolplane_webhook.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import (
5656
ironicv1 "github.com/openstack-k8s-operators/ironic-operator/api/v1beta1"
5757
manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
5858
neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
59-
novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
59+
novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
6060
octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
6161
swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
6262
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"

‎api/core/v1beta1/openstackcontrolplane_webhook_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
1414
mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
1515
neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
16-
novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
16+
novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
1717
octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
1818
swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
1919
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"

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

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

‎api/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260321081547-64d64a0c02c7
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260321081546-85bcf5293c70
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260314103518-fe1a1eae182d
24-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260314091347-3f967274eff3
24+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260324185405-5701277f8fe2
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260320063057-a82e61ffdd6b
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260321082950-d7798d4bc5bd
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260324093450-6c7afb9e632f

‎api/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260321081546-
144144
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260321081546-85bcf5293c70/go.mod h1:cyeexUkEIgzQ3c1vVVv/DQ3AbnECfDwKdZteKC+sZKY=
145145
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260314103518-fe1a1eae182d h1:oKRiIKhr1dm1wudWqBMvLViMPlXqi8B+PQT2Mv7rsj4=
146146
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260314103518-fe1a1eae182d/go.mod h1:ljfpLBr2EyNAS7W7c+CQy61UhkwALTVLWl2Mc9YTSNA=
147-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260314091347-3f967274eff3 h1:W85oaZBQ/XmaPshZjOi46VMkzRUmZ17WDXbWcl4S6eM=
148-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260314091347-3f967274eff3/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc=
147+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260324185405-5701277f8fe2 h1:q5dK7GggmutgL8Rrfb7JNg1oKwLpe0uppW3Cm/hdupo=
148+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260324185405-5701277f8fe2/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc=
149149
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260320063057-a82e61ffdd6b h1:4vBr+f5KLrvg8XUtzWJ7F7fiJXS9UFMGnbPn3/quE+I=
150150
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260320063057-a82e61ffdd6b/go.mod h1:XO02J/MSp7f+HMyoT5xImUvTtDvDY4SgG2mi+nwdTMY=
151151
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260321082950-d7798d4bc5bd h1:zBTXXBuxdMHG/sPj53Y82iRnaU73vxz7+2n0G0Z7qAQ=

‎cmd/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ import (
7070
manilav1 "github.com/openstack-k8s-operators/manila-operator/api/v1beta1"
7171
mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
7272
neutronv1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1"
73-
novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
73+
novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
7474
octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
7575
baremetalv1 "github.com/openstack-k8s-operators/openstack-baremetal-operator/api/v1beta1"
7676
clientv1 "github.com/openstack-k8s-operators/openstack-operator/api/client/v1beta1"

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
- name: RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL
3939
value: quay.io/openstack-k8s-operators/neutron-operator@sha256:526f9d4965431e1a5e4f8c3224bcee3f636a3108a5e0767296a994c2a517404a
4040
- name: RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL
41-
value: quay.io/openstack-k8s-operators/nova-operator@sha256:7398eb8fa5a4844d3326a5dff759d17199870c389b3ce3011a038b27bf95512a
41+
value: quay.io/openstack-k8s-operators/nova-operator@sha256:388c06cd947e4eaf823e3d64de2d3ba7660dbd9d4c01729d92bd628e5e73bc5f
4242
- name: RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL
4343
value: quay.io/openstack-k8s-operators/octavia-operator@sha256:b6d44a28b047f402b17b4cc07584f04cd6f1168d8742a9a8b17a9ce7c8550c5a
4444
- name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260321081547-64d64a0c02c7
3030
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260321081546-85bcf5293c70
3131
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260314103518-fe1a1eae182d
32-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260314091347-3f967274eff3
32+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260324185405-5701277f8fe2
3333
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260320063057-a82e61ffdd6b
3434
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260321082950-d7798d4bc5bd
3535
github.com/openstack-k8s-operators/openstack-operator/api v0.0.0-00010101000000-000000000000

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260321081546-
174174
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260321081546-85bcf5293c70/go.mod h1:cyeexUkEIgzQ3c1vVVv/DQ3AbnECfDwKdZteKC+sZKY=
175175
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260314103518-fe1a1eae182d h1:oKRiIKhr1dm1wudWqBMvLViMPlXqi8B+PQT2Mv7rsj4=
176176
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260314103518-fe1a1eae182d/go.mod h1:ljfpLBr2EyNAS7W7c+CQy61UhkwALTVLWl2Mc9YTSNA=
177-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260314091347-3f967274eff3 h1:W85oaZBQ/XmaPshZjOi46VMkzRUmZ17WDXbWcl4S6eM=
178-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260314091347-3f967274eff3/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc=
177+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260324185405-5701277f8fe2 h1:q5dK7GggmutgL8Rrfb7JNg1oKwLpe0uppW3Cm/hdupo=
178+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260324185405-5701277f8fe2/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc=
179179
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260320063057-a82e61ffdd6b h1:4vBr+f5KLrvg8XUtzWJ7F7fiJXS9UFMGnbPn3/quE+I=
180180
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260320063057-a82e61ffdd6b/go.mod h1:XO02J/MSp7f+HMyoT5xImUvTtDvDY4SgG2mi+nwdTMY=
181181
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260321082950-d7798d4bc5bd h1:zBTXXBuxdMHG/sPj53Y82iRnaU73vxz7+2n0G0Z7qAQ=

0 commit comments

Comments
 (0)