Skip to content

Commit 4e2b552

Browse files
auniyal61amartyasinha
auniyal61
authored and
amartyasinha
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
1 parent f75fe43 commit 4e2b552

15 files changed

Lines changed: 19 additions & 366 deletions

‎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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ require (
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.20260420053123-cf0908d8cf39
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.20260418085220-949c802081aa
3029
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260420053123-02a691a5b4d4
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/amartyasinha/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/amartyasinha/nova-operator/api v0.0.0-20260415060735-b54a701efcaf h1:amqohefOYtUs0mYie40WsZY+9YsMFTuAEmZecSfwR8Q=
4+
github.com/amartyasinha/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.20260420052839-b9314e4e03a3 h1:XyJrYBPiLCyUysII5RtHKjTekxrL3wxPEBlSvo0SKOQ=
146148
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260420052839-b9314e4e03a3/go.mod h1:5jWDZDariGwym2q926i/VtR16dgNAvY4mTM/UekciKw=
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.20260420053123-cf0908d8cf39 h1:PQ025L6DttCoxwHqLTpw0v0W9VEXrCqYLfGDnR04GyI=
154154
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260420053123-cf0908d8cf39/go.mod h1:ODYNTFMUlzvjlqXAh9AGXrzpBNQBAOkWiNQ6UldsqFw=
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.20260418085220-949c802081aa h1:pnzRdcdTy91mxcU93e7xp9gn+pNyWyOdB8w/WlRynvo=
158156
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260418085220-949c802081aa/go.mod h1:REDdMRGrY7JhGOsrKXt4hNZJAq0f6b3ykVh/Wyy4UXs=
159157
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260420053123-02a691a5b4d4 h1:82WLFtF/6P1VwcVoyfO9vjEdMnkQFpHkVq4I3YY7L28=

0 commit comments

Comments
 (0)