From 5ff81e038ea21d3548746a8729bd9c3b13b0f1ee Mon Sep 17 00:00:00 2001 From: Amit Uniyal Date: Wed, 15 Apr 2026 20:31:37 +0530 Subject: [PATCH] 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 --- .../v1beta1/openstackcontrolplane_types.go | 2 +- .../v1beta1/openstackcontrolplane_webhook.go | 2 +- api/core/v1beta1/zz_generated.deepcopy.go | 4 +- api/go.mod | 5 +- api/go.sum | 6 +- bindata/rbac/placement-operator-rbac.yaml | 343 ------------------ cmd/main.go | 2 +- config/operator/manager_operator_images.yaml | 2 - go.mod | 5 +- go.sum | 6 +- hack/export_operator_related_images.sh | 1 - .../core/openstackcontrolplane_controller.go | 2 +- internal/openstack/common.go | 2 +- internal/openstack/placement.go | 2 +- .../openstackoperator_controller_test.go | 2 +- test/functional/ctlplane/suite_test.go | 4 +- 16 files changed, 21 insertions(+), 369 deletions(-) delete mode 100644 bindata/rbac/placement-operator-rbac.yaml diff --git a/api/core/v1beta1/openstackcontrolplane_types.go b/api/core/v1beta1/openstackcontrolplane_types.go index f49e6b47e8..58e5171384 100644 --- a/api/core/v1beta1/openstackcontrolplane_types.go +++ b/api/core/v1beta1/openstackcontrolplane_types.go @@ -44,7 +44,7 @@ import ( octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" "github.com/openstack-k8s-operators/openstack-operator/api/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/api/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/api/core/v1beta1/openstackcontrolplane_webhook.go b/api/core/v1beta1/openstackcontrolplane_webhook.go index bd46c8f7e9..43993f60c8 100644 --- a/api/core/v1beta1/openstackcontrolplane_webhook.go +++ b/api/core/v1beta1/openstackcontrolplane_webhook.go @@ -29,7 +29,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/api/placement/v1beta1" watcherv1 "github.com/openstack-k8s-operators/watcher-operator/api/v1beta1" "golang.org/x/exp/maps" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/api/core/v1beta1/zz_generated.deepcopy.go b/api/core/v1beta1/zz_generated.deepcopy.go index 3109972a84..94cd7761c6 100644 --- a/api/core/v1beta1/zz_generated.deepcopy.go +++ b/api/core/v1beta1/zz_generated.deepcopy.go @@ -41,9 +41,9 @@ import ( mariadb_operatorapiv1beta1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1" neutron_operatorapiv1beta1 "github.com/openstack-k8s-operators/neutron-operator/api/v1beta1" novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1" + placementv1beta1 "github.com/openstack-k8s-operators/nova-operator/api/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" @@ -1642,7 +1642,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/api/go.mod b/api/go.mod index 8b8ef15c19..fe519f0b6e 100644 --- a/api/go.mod +++ b/api/go.mod @@ -21,11 +21,10 @@ require ( github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260413141051-c1705330af2f github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-564a51226a2a github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b - github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10 + github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260415060735-b54a701efcaf github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d - github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260413152106-eed87975fb7b github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260413103111-95e126b47f76 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 replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging + +replace github.com/openstack-k8s-operators/nova-operator/api => github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf //allow-merging diff --git a/api/go.sum b/api/go.sum index 7f4aa4f9e8..701dbc7ac5 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,5 +1,7 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= +github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf h1:Q37gJOIUmX1IQmWCatE2SOa+jvz95FUIKrIIj4QNRB0= +github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= 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- github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-564a51226a2a/go.mod h1:g/xgMnzNHxdTkqnEgAKwVOv75uPN4nuApbkGqSvASvs= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b h1:227STKWjY04GSy6UtayoF0uljAOb5ldQR19wqdacNto= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b/go.mod h1:xiXIGbCLTNkVAI7wig0+SRMjTWxBTUHsiw5JuU6fgVo= -github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10 h1:6DQAN11CMaStZezMumXgayPpJQVGfsWxn04xPsOsHaM= -github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378 h1:h72lnvPcecgJqOindL68zIZmcJY6xM0EjY5FYe5Z7Qw= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378/go.mod h1:XO02J/MSp7f+HMyoT5xImUvTtDvDY4SgG2mi+nwdTMY= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c h1:77hLym7nButLmaRm2aKozn0kW2WmrAaaYpx/HWHlUzc= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c/go.mod h1:WKiIsGtY1q6VbpSa8QmOY3rYFpI061hwqYVFnAFfiFI= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d h1:fS8I0ZH7bvs3b5Jh4b+YU8S2jMSuZFY/k/T4aPQ9OHw= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d/go.mod h1:wtnlbYH3u8jHHKltKDCf0ILNtCe7ZnOJSreSGXCbb2w= -github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d h1:ZvVIq5E/F82tqQckheo3WnL6XywTPc+PiJWyrllkyVo= -github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d/go.mod h1:34ka8QoEZ2LFmJv6wO5l9U29f9Kd1vizVzbkzRQnwVA= github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260413152106-eed87975fb7b h1:jB8BCAmnThsr27g3GdrzsqVkoADffOnBNyJQD1B9t04= github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260413152106-eed87975fb7b/go.mod h1:LkT41wj0Dqvzm5uOJHUlr+vDYYnI70CoLtZQOVAh3SI= github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260413103111-95e126b47f76 h1:a2rRNC/XurgW4vdcCTaB/oxhqPCtsQSEyvztzCfKQ8E= diff --git a/bindata/rbac/placement-operator-rbac.yaml b/bindata/rbac/placement-operator-rbac.yaml deleted file mode 100644 index 91758f2b12..0000000000 --- a/bindata/rbac/placement-operator-rbac.yaml +++ /dev/null @@ -1,343 +0,0 @@ -# NOTE: this file is automatically generated by hack/sync-bindata.sh! -# ---- -apiVersion: cert-manager.io/v1 -kind: Issuer -metadata: - labels: - app.kubernetes.io/component: certificate - app.kubernetes.io/created-by: openstack-operator - app.kubernetes.io/instance: selfsigned-issuer - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: issuer - app.kubernetes.io/part-of: placement-operator - name: placement-operator-selfsigned-issuer - namespace: '{{ .OperatorNamespace }}' -spec: - selfSigned: {} ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: placement-operator-controller-manager - namespace: '{{ .OperatorNamespace }}' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: placement-operator-leader-election-role - namespace: '{{ .OperatorNamespace }}' -rules: -- apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - "" - resources: - - events - verbs: - - create - - patch ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - creationTimestamp: null - name: placement-operator-manager-role -rules: -- apiGroups: - - "" - resources: - - configmaps - - pods - - secrets - - services - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - "" - resources: - - serviceaccounts - verbs: - - create - - get - - list - - patch - - update - - watch -- apiGroups: - - apps - resources: - - deployments - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - batch - resources: - - jobs - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - k8s.cni.cncf.io - resources: - - network-attachment-definitions - verbs: - - get - - list - - watch -- apiGroups: - - keystone.openstack.org - resources: - - keystoneapis - verbs: - - get - - list - - watch -- apiGroups: - - keystone.openstack.org - resources: - - keystoneendpoints - - keystoneservices - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - mariadb.openstack.org - resources: - - mariadbaccounts - - mariadbdatabases - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - mariadb.openstack.org - resources: - - mariadbaccounts/finalizers - - mariadbdatabases/finalizers - verbs: - - patch - - update -- apiGroups: - - placement.openstack.org - resources: - - placementapis - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - placement.openstack.org - resources: - - placementapis/finalizers - verbs: - - patch - - update -- apiGroups: - - placement.openstack.org - resources: - - placementapis/status - verbs: - - get - - patch - - update -- apiGroups: - - rbac.authorization.k8s.io - resources: - - rolebindings - - roles - verbs: - - create - - get - - list - - patch - - update - - watch -- apiGroups: - - security.openshift.io - resourceNames: - - anyuid - resources: - - securitycontextconstraints - verbs: - - use -- apiGroups: - - topology.openstack.org - resources: - - topologies - verbs: - - get - - list - - update - - watch -- apiGroups: - - authentication.k8s.io - resources: - - tokenreviews - verbs: - - create -- apiGroups: - - authorization.k8s.io - resources: - - subjectaccessreviews - verbs: - - create ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: placement-operator-leader-election-rolebinding - namespace: '{{ .OperatorNamespace }}' -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: placement-operator-leader-election-role -subjects: -- kind: ServiceAccount - name: placement-operator-controller-manager - namespace: '{{ .OperatorNamespace }}' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: placement-operator-manager-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: placement-operator-manager-role -subjects: -- kind: ServiceAccount - name: placement-operator-controller-manager - namespace: '{{ .OperatorNamespace }}' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: placement-operator-operator-metrics-auth-role -rules: -- apiGroups: - - authentication.k8s.io - resources: - - tokenreviews - verbs: - - create -- apiGroups: - - authorization.k8s.io - resources: - - subjectaccessreviews - verbs: - - create ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: placement-operator-operator-metrics-reader -rules: -- nonResourceURLs: - - /metrics - verbs: - - get ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: placement-operator-operator-metrics-auth-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: placement-operator-operator-metrics-auth-role -subjects: -- kind: ServiceAccount - name: placement-operator-operator-controller-manager - namespace: '{{ .OperatorNamespace }}' ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app.kubernetes.io/name: placement-operator - control-plane: controller-manager - name: placement-operator-controller-manager-metrics-service - namespace: '{{ .OperatorNamespace }}' -spec: - ports: - - name: https - port: 8443 - protocol: TCP - targetPort: 8443 - selector: - app.kubernetes.io/name: placement-operator - control-plane: controller-manager ---- ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - labels: - app.kubernetes.io/component: certificate - app.kubernetes.io/created-by: openstack-operator - app.kubernetes.io/instance: metrics-certs - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: placement-operator - name: placement-operator-metrics-certs - namespace: '{{ .OperatorNamespace }}' -spec: - dnsNames: - - placement-operator-metrics-service.{{ .OperatorNamespace }}.svc - - placement-operator-metrics-service.{{ .OperatorNamespace }}.svc.cluster.local - issuerRef: - kind: Issuer - name: placement-operator-selfsigned-issuer - secretName: placement-operator-metrics-server-cert diff --git a/cmd/main.go b/cmd/main.go index 6df1bb0aed..70142a6dbb 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -71,6 +71,7 @@ import ( 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/nova/v1beta1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/api/placement/v1beta1" octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" baremetalv1 "github.com/openstack-k8s-operators/openstack-baremetal-operator/api/v1beta1" clientv1 "github.com/openstack-k8s-operators/openstack-operator/api/client/v1beta1" @@ -78,7 +79,6 @@ import ( dataplanev1 "github.com/openstack-k8s-operators/openstack-operator/api/dataplane/v1beta1" "github.com/openstack-k8s-operators/openstack-operator/internal/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" _ "github.com/openstack-k8s-operators/test-operator/api/v1beta1" diff --git a/config/operator/manager_operator_images.yaml b/config/operator/manager_operator_images.yaml index d93ca06a8e..bb2c6fe8e8 100644 --- a/config/operator/manager_operator_images.yaml +++ b/config/operator/manager_operator_images.yaml @@ -45,8 +45,6 @@ spec: value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:03e1133636014341091acf892ed749f92643dabe4bfbc40c6b23ffc323581f02 - name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/ovn-operator@sha256:133419f2dceee7fdba9c21c96fb385abb1bc8e8a6a2471dfa9f6aea2d9183aac - - name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL - value: quay.io/openstack-k8s-operators/placement-operator@sha256:ca04fe7352ca3d6eaed5842f84c0efaa160403649d5bd6281d9b4ff7b315b6ec - name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/swift-operator@sha256:4aec097ce4497e03ee7d6e232a1ff5146d5363ba903ecf580875ab10617c0602 - name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL diff --git a/go.mod b/go.mod index 49251843d2..dde8ef2d3a 100644 --- a/go.mod +++ b/go.mod @@ -29,12 +29,11 @@ require ( github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260413141051-c1705330af2f github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-564a51226a2a github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b - github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10 + github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260415060735-b54a701efcaf github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c github.com/openstack-k8s-operators/openstack-operator/api v0.0.0-00010101000000-000000000000 github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d - github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260413152106-eed87975fb7b github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260413103111-95e126b47f76 github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20260414081951-9a689c200afe @@ -154,6 +153,8 @@ require ( replace github.com/openstack-k8s-operators/openstack-operator/api => ./api //allow-merging +replace github.com/openstack-k8s-operators/nova-operator/api => github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf //allow-merging + // mschuppert: map to latest commit from release-4.18 tag // must consistent within modules and service operators replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging diff --git a/go.sum b/go.sum index a43439f8ff..6e3c9bd798 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8 github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf h1:Q37gJOIUmX1IQmWCatE2SOa+jvz95FUIKrIIj4QNRB0= +github.com/auniyal61/nova-operator/api v0.0.0-20260415060735-b54a701efcaf/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= 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- github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260413152655-564a51226a2a/go.mod h1:g/xgMnzNHxdTkqnEgAKwVOv75uPN4nuApbkGqSvASvs= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b h1:227STKWjY04GSy6UtayoF0uljAOb5ldQR19wqdacNto= github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260415055437-26247a82c50b/go.mod h1:xiXIGbCLTNkVAI7wig0+SRMjTWxBTUHsiw5JuU6fgVo= -github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10 h1:6DQAN11CMaStZezMumXgayPpJQVGfsWxn04xPsOsHaM= -github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260413153813-b59b2a226c10/go.mod h1:ZQpGqN3AszLv7OoySPuCFyrNkuOEi1lPTymhbd1gOrc= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378 h1:h72lnvPcecgJqOindL68zIZmcJY6xM0EjY5FYe5Z7Qw= github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260413082059-d107b5bac378/go.mod h1:XO02J/MSp7f+HMyoT5xImUvTtDvDY4SgG2mi+nwdTMY= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c h1:77hLym7nButLmaRm2aKozn0kW2WmrAaaYpx/HWHlUzc= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260413094947-83f411fa655c/go.mod h1:WKiIsGtY1q6VbpSa8QmOY3rYFpI061hwqYVFnAFfiFI= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d h1:fS8I0ZH7bvs3b5Jh4b+YU8S2jMSuZFY/k/T4aPQ9OHw= github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260414143608-81fd12b77b2d/go.mod h1:wtnlbYH3u8jHHKltKDCf0ILNtCe7ZnOJSreSGXCbb2w= -github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d h1:ZvVIq5E/F82tqQckheo3WnL6XywTPc+PiJWyrllkyVo= -github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260413090520-f18a11875c1d/go.mod h1:34ka8QoEZ2LFmJv6wO5l9U29f9Kd1vizVzbkzRQnwVA= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg= github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260413152106-eed87975fb7b h1:jB8BCAmnThsr27g3GdrzsqVkoADffOnBNyJQD1B9t04= diff --git a/hack/export_operator_related_images.sh b/hack/export_operator_related_images.sh index 9848f2ee29..2027afb66c 100644 --- a/hack/export_operator_related_images.sh +++ b/hack/export_operator_related_images.sh @@ -16,7 +16,6 @@ export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-opera export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:3d89dcb18665d069912ab91c3d5ff5b7466b1def1ef03a9f7a833e3275742dee export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:03e1133636014341091acf892ed749f92643dabe4bfbc40c6b23ffc323581f02 export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:133419f2dceee7fdba9c21c96fb385abb1bc8e8a6a2471dfa9f6aea2d9183aac -export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:ca04fe7352ca3d6eaed5842f84c0efaa160403649d5bd6281d9b4ff7b315b6ec export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:4aec097ce4497e03ee7d6e232a1ff5146d5363ba903ecf580875ab10617c0602 export RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/telemetry-operator@sha256:ce0d4352fc4f83dc82c1241cf1cfd52f8c2f19364a0b0636032425baea6550ec export RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/test-operator@sha256:16edab6829dd7e0d28359238d135a08a47a69ea75779e603cfcea38d7614fe04 diff --git a/internal/controller/core/openstackcontrolplane_controller.go b/internal/controller/core/openstackcontrolplane_controller.go index 8a96dff22b..842a386343 100644 --- a/internal/controller/core/openstackcontrolplane_controller.go +++ b/internal/controller/core/openstackcontrolplane_controller.go @@ -53,8 +53,8 @@ import ( "github.com/openstack-k8s-operators/openstack-operator/internal/openstack" rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/api/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/internal/openstack/common.go b/internal/openstack/common.go index 07d0f6ecd6..ce84848f32 100644 --- a/internal/openstack/common.go +++ b/internal/openstack/common.go @@ -38,8 +38,8 @@ import ( corev1 "github.com/openstack-k8s-operators/openstack-operator/api/core/v1beta1" // corev1 "k8s.io/api/core/v1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/api/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" diff --git a/internal/openstack/placement.go b/internal/openstack/placement.go index 60c17ad57d..96a1d3dab5 100644 --- a/internal/openstack/placement.go +++ b/internal/openstack/placement.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + placementv1 "github.com/openstack-k8s-operators/nova-operator/api/placement/v1beta1" corev1beta1 "github.com/openstack-k8s-operators/openstack-operator/api/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/test/functional/ctlplane/openstackoperator_controller_test.go b/test/functional/ctlplane/openstackoperator_controller_test.go index 6ac8e0baa6..32c8684e57 100644 --- a/test/functional/ctlplane/openstackoperator_controller_test.go +++ b/test/functional/ctlplane/openstackoperator_controller_test.go @@ -50,10 +50,10 @@ import ( "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/nova/v1beta1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/api/placement/v1beta1" clientv1 "github.com/openstack-k8s-operators/openstack-operator/api/client/v1beta1" corev1 "github.com/openstack-k8s-operators/openstack-operator/api/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/test/functional/ctlplane/suite_test.go b/test/functional/ctlplane/suite_test.go index bfaab96716..fe6ec9a314 100644 --- a/test/functional/ctlplane/suite_test.go +++ b/test/functional/ctlplane/suite_test.go @@ -47,13 +47,13 @@ import ( 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/nova/v1beta1" + placementv1 "github.com/openstack-k8s-operators/nova-operator/api/placement/v1beta1" octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1" openstackclientv1 "github.com/openstack-k8s-operators/openstack-operator/api/client/v1beta1" corev1 "github.com/openstack-k8s-operators/openstack-operator/api/core/v1beta1" dataplanev1beta1 "github.com/openstack-k8s-operators/openstack-operator/api/dataplane/v1beta1" "github.com/openstack-k8s-operators/openstack-operator/internal/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" @@ -163,7 +163,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/api", gomod, "bases") Expect(err).ShouldNot(HaveOccurred()) swiftv1CRDs, err := test.GetCRDDirFromModule( "github.com/openstack-k8s-operators/swift-operator/api", gomod, "bases")