Skip to content

Commit c960af3

Browse files
auniyal61auniyal61
committed
Update openstack-operator to use placement API from nova-operator
Replace placement-operator dependency with nova-operator's placement API now that placement code has been integrated into nova-operator - Update all imports from placement-operator/api to nova-operator/api/placement - Remove placement-operator from go.mod and api/go.mod dependencies - Update nova-operator dependency to placement-integration-v5 - Add replace directives pointing to auniyal61/nova-operator fork (temporary) - Clean up go.sum files to remove stale placement-operator entries Depends-On: openstack-k8s-operators/nova-operator#1101
1 parent 36789c2 commit c960af3

File tree

13 files changed

+20
-22
lines changed

13 files changed

+20
-22
lines changed

‎api/core/v1beta1/openstackcontrolplane_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import (
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"
47-
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
47+
placementv1 "github.com/openstack-k8s-operators/nova-operator/api/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"

‎api/core/v1beta1/openstackcontrolplane_webhook.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/openstack-k8s-operators/lib-common/modules/common/route"
3030
common_webhook "github.com/openstack-k8s-operators/lib-common/modules/common/webhook"
3131
mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
32-
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
32+
placementv1 "github.com/openstack-k8s-operators/nova-operator/api/placement/v1beta1"
3333
watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1"
3434
"golang.org/x/exp/maps"
3535
apierrors "k8s.io/apimachinery/pkg/api/errors"

‎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: 3 additions & 2 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.20260413141051-c1705330af2f
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-564a51226a2a
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b
24-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10
24+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260415060735-b54a701efcaf
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d
28-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d
2928
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260413152106-eed87975fb7b
3029
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260413103111-95e126b47f76
3130
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260414124111-458e17672b3c
@@ -142,3 +141,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
142141
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
143142

144143
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
144+
145+
replace github.com/openstack-k8s-operators/nova-operator/api => github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf //allow-merging

‎api/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
22
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
3+
github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf h1:Q37gJOIUmX1IQmWCatE2SOa+jvz95FUIKrIIj4QNRB0=
4+
github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc=
35
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
46
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
57
github.com/cert-manager/cert-manager v1.16.5 h1:XIhKoS4zQV9RHXAkqQW0NLivvoxAnWzbPsy9BG6cPVc=
@@ -144,16 +146,12 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-
144146
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-564a51226a2a/go.mod h1:g/xgMnzNHxdTkqnEgAKwVOv75uPN4nuApbkGqSvASvs=
145147
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b h1:227STKWjY04GSy6UtayoF0uljAOb5ldQR19wqdacNto=
146148
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b/go.mod h1:xiXIGbCLTNkVAI7wig0+SRMjTWxBTUHsiw5JuU6fgVo=
147-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10 h1:6DQAN11CMaStZezMumXgayPpJQVGfsWxn04xPsOsHaM=
148-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc=
149149
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378 h1:h72lnvPcecgJqOindL68zIZmcJY6xM0EjY5FYe5Z7Qw=
150150
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378/go.mod h1:XO02J/MSp7f+HMyoT5xImUvTtDvDY4SgG2mi+nwdTMY=
151151
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c h1:77hLym7nButLmaRm2aKozn0kW2WmrAaaYpx/HWHlUzc=
152152
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c/go.mod h1:WKiIsGtY1q6VbpSa8QmOY3rYFpI061hwqYVFnAFfiFI=
153153
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d h1:fS8I0ZH7bvs3b5Jh4b+YU8S2jMSuZFY/k/T4aPQ9OHw=
154154
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d/go.mod h1:wtnlbYH3u8jHHKltKDCf0ILNtCe7ZnOJSreSGXCbb2w=
155-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d h1:ZvVIq5E/F82tqQckheo3WnL6XywTPc+PiJWyrllkyVo=
156-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d/go.mod h1:34ka8QoEZ2LFmJv6wO5l9U29f9Kd1vizVzbkzRQnwVA=
157155
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260413152106-eed87975fb7b h1:jB8BCAmnThsr27g3GdrzsqVkoADffOnBNyJQD1B9t04=
158156
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260413152106-eed87975fb7b/go.mod h1:LkT41wj0Dqvzm5uOJHUlr+vDYYnI70CoLtZQOVAh3SI=
159157
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260413103111-95e126b47f76 h1:a2rRNC/XurgW4vdcCTaB/oxhqPCtsQSEyvztzCfKQ8E=

‎cmd/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ import (
7878
dataplanev1 "github.com/openstack-k8s-operators/openstack-operator/api/dataplane/v1beta1"
7979
"github.com/openstack-k8s-operators/openstack-operator/internal/openstack"
8080
ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
81-
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
81+
placementv1 "github.com/openstack-k8s-operators/nova-operator/api/placement/v1beta1"
8282
swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
8383
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
8484
_ "github.com/openstack-k8s-operators/test-operator/api/v1beta1"

‎go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,11 @@ require (
2929
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260413141051-c1705330af2f
3030
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-564a51226a2a
3131
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b
32-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10
32+
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260415060735-b54a701efcaf
3333
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378
3434
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c
3535
github.com/openstack-k8s-operators/openstack-operator/api v0.0.0-00010101000000-000000000000
3636
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d
37-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d
3837
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260413152106-eed87975fb7b
3938
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260413103111-95e126b47f76
4039
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20260414081951-9a689c200afe
@@ -154,6 +153,8 @@ require (
154153

155154
replace github.com/openstack-k8s-operators/openstack-operator/api => ./api //allow-merging
156155

156+
replace github.com/openstack-k8s-operators/nova-operator/api => github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf //allow-merging
157+
157158
// mschuppert: map to latest commit from release-4.18 tag
158159
// must consistent within modules and service operators
159160
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8
44
github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
55
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
66
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
7+
github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf h1:Q37gJOIUmX1IQmWCatE2SOa+jvz95FUIKrIIj4QNRB0=
8+
github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc=
79
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
810
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
911
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
@@ -174,16 +176,12 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-
174176
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-564a51226a2a/go.mod h1:g/xgMnzNHxdTkqnEgAKwVOv75uPN4nuApbkGqSvASvs=
175177
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b h1:227STKWjY04GSy6UtayoF0uljAOb5ldQR19wqdacNto=
176178
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b/go.mod h1:xiXIGbCLTNkVAI7wig0+SRMjTWxBTUHsiw5JuU6fgVo=
177-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10 h1:6DQAN11CMaStZezMumXgayPpJQVGfsWxn04xPsOsHaM=
178-
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc=
179179
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378 h1:h72lnvPcecgJqOindL68zIZmcJY6xM0EjY5FYe5Z7Qw=
180180
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378/go.mod h1:XO02J/MSp7f+HMyoT5xImUvTtDvDY4SgG2mi+nwdTMY=
181181
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c h1:77hLym7nButLmaRm2aKozn0kW2WmrAaaYpx/HWHlUzc=
182182
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c/go.mod h1:WKiIsGtY1q6VbpSa8QmOY3rYFpI061hwqYVFnAFfiFI=
183183
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d h1:fS8I0ZH7bvs3b5Jh4b+YU8S2jMSuZFY/k/T4aPQ9OHw=
184184
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d/go.mod h1:wtnlbYH3u8jHHKltKDCf0ILNtCe7ZnOJSreSGXCbb2w=
185-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d h1:ZvVIq5E/F82tqQckheo3WnL6XywTPc+PiJWyrllkyVo=
186-
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d/go.mod h1:34ka8QoEZ2LFmJv6wO5l9U29f9Kd1vizVzbkzRQnwVA=
187185
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=
188186
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
189187
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260413152106-eed87975fb7b h1:jB8BCAmnThsr27g3GdrzsqVkoADffOnBNyJQD1B9t04=

‎internal/controller/core/openstackcontrolplane_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import (
5454

5555
rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1"
5656
ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
57-
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
57+
placementv1 "github.com/openstack-k8s-operators/nova-operator/api/placement/v1beta1"
5858
swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
5959
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
6060
watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1"

‎internal/openstack/common.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939

4040
// corev1 "k8s.io/api/core/v1"
4141
ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
42-
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
42+
placementv1 "github.com/openstack-k8s-operators/nova-operator/api/placement/v1beta1"
4343
swiftv1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
4444
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
4545

0 commit comments

Comments
 (0)