Implement messaging bus configuration with annotation-based migration#1797
Merged
openshift-merge-bot[bot] merged 1 commit intoopenstack-k8s-operators:mainfrom Feb 7, 2026
Conversation
Contributor
Author
we hit the race between the two kuttl jobs, but one succeeded. |
lmiccini
force-pushed
the
rmq_migration_annotation
branch
from
fd50bda to
95a70b4
Compare
lmiccini
changed the title
lmiccini
force-pushed
the
rmq_migration_annotation
branch
from
95a70b4 to
8077505
Compare
lmiccini
requested review from
fmount and
stuggi
and removed request for
fultonj
lmiccini
force-pushed
the
rmq_migration_annotation
branch
from
8077505 to
39b6592
Compare
lmiccini
force-pushed
the
rmq_migration_annotation
branch
2 times, most recently
from
07ccc4b to
7687a0f
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/45ebc4b16c8743b6836c1f6d7718a0b7 ❌ openstack-k8s-operators-content-provider FAILURE in 12m 53s |
This was referenced Feb 5, 2026
lmiccini
force-pushed
the
rmq_migration_annotation
branch
from
7687a0f to
06f0c47
Compare
Contributor
Author
|
/test functional |
Contributor
Author
|
/retest |
lmiccini
force-pushed
the
rmq_migration_annotation
branch
from
06f0c47 to
321b602
Compare
This was referenced Feb 6, 2026
This was referenced Feb 6, 2026
lmiccini
force-pushed
the
rmq_migration_annotation
branch
from
321b602 to
97dddde
Compare
Contributor
Author
|
/test functional |
Contributor
Author
|
amoralej
reviewed
Feb 6, 2026
amoralej
reviewed
Feb 6, 2026
lmiccini
force-pushed
the
rmq_migration_annotation
branch
4 times, most recently
from
6eb9256 to
4054618
Compare
This was referenced Feb 7, 2026
This commit introduces a new messaging bus configuration system that supports: - Top-level messagingBus and notificationsBus configuration fields that services can inherit from - Per-service messagingBus and notificationsBus overrides - Validation to prevent setting the User field at the top level (which would cause conflicts as each service creates its own RabbitMQUser) - Automatic migration from deprecated fields to new fields via webhook The migration strategy uses an annotation-based approach where the controller detects deprecated field usage and sets a reconcile trigger annotation, which causes the UPDATE webhook to perform the migration. This ensures the webhook (which has the proper mutating webhook configuration) handles all spec mutations, avoiding field ownership issues with server-side apply and GitOps workflows. Deprecated fields that are migrated: - Top-level: notificationsBusInstance -> notificationsBus.cluster - Service-level: rabbitMqClusterName -> messagingBus.cluster or notificationsBus.cluster depending on the service - Service-level: notificationsBusInstance -> notificationsBus.cluster (for Cinder, Manila, Neutron, Nova, Watcher) Services inherit from top-level configuration if their service-level fields are not set, following the priority: 1. Service-level deprecated field (if set) 2. Service-level new field (if set) 3. Top-level configuration (if set) 4. Default value Additional fixes: Fix pin-bundle-images.sh to handle operators with replace directives by forcing quay.io for replaced operators and adding fallback logic when bundles are not available in custom registries Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
lmiccini
force-pushed
the
rmq_migration_annotation
branch
from
4054618 to
507cdb8
Compare
Contributor
|
/override ci/prow/precommit-check |
Contributor
|
@stuggi: Overrode contexts on behalf of stuggi: ci/prow/precommit-check DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: fmount, lmiccini The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit ba936f5
into
openstack-k8s-operators:main
8 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit introduces a new messaging bus configuration system that
supports:
services can inherit from
would cause conflicts as each service creates its own RabbitMQUser)
The migration strategy uses an annotation-based approach where the
controller detects deprecated field usage and sets a reconcile trigger
annotation, which causes the UPDATE webhook to perform the migration.
This ensures the webhook (which has the proper mutating webhook
configuration) handles all spec mutations, avoiding field ownership
issues with server-side apply and GitOps workflows.
Deprecated fields that are migrated:
notificationsBus.cluster depending on the service
(for Cinder, Manila, Neutron, Nova, Watcher)
Services inherit from top-level configuration if their service-level
fields are not set, following the priority:
Additional fixes:
Fix pin-bundle-images.sh to handle operators with replace directives
by forcing quay.io for replaced operators and adding fallback logic
when bundles are not available in custom registries
Co-Authored-By: Claude Sonnet 4.5 noreply@anthropic.com
Depends-on: openstack-k8s-operators/data-plane-adoption#1222