Skip to content

[18.0-fr7] Reconcile when custom route cert secret content changes - #2202

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18.0-fr7from
openshift-cherrypick-robot:cherry-pick-2199-to-18.0-fr7
Oct 29, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18.0-fr7from
openshift-cherrypick-robot:cherry-pick-2199-to-18.0-fr7

Conversation

@openshift-cherrypick-robot

@openshift-cherrypick-robot openshift-cherrypick-robot commented Oct 28, 2026 •

Copy link
Copy Markdown

This is an automated cherry-pick of #2199

/assign stuggi

Jira: OSPRH-39589
Jira: OSPRH-39944

When a user updates the content of a secret referenced by
spec.<service>.apiOverride.tls.secretName, the control plane was not
reconciled, so the Routes kept the old certificate.

Index the apiOverride TLS secret names of all services so the existing
Secret watch enqueues the control plane. The existing field indexers and
allWatchFields are consolidated into a single fieldIndexers map, used for
both registration and lookup.

Add unit tests for the secret name collection (reflection based, fails
when a new Override field is not covered) and for findObjectsForSrc. Add
functional tests: a route update smoke test, and a test asserting the
watch registered by SetupWithManager enqueues the control plane, using a
second manager with a recording no-op reconcile.

Jira: OSPRH-39589

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Oct 28, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Central YAML (base), Organization UI (inherited)
  • Review profile: CHILL
  • Plan: Enterprise
  • Run ID: fd21c370-9ad5-49ac-93ca-8a9837929d6b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Comment @coderabbitai help to get the list of available commands.

@github-actions

Copy link
Copy Markdown

OpenStackControlPlane CRD Size Report

Metric Value
CRD JSON size 365307 bytes (357KB)
Base branch size 365307 bytes
Change +0.00%
Status yellow — growing
Threshold reference
Color Range Meaning
🟢 green < 300KB Comfortable
🟡 yellow 300–400KB Growing
🟠 orange 400–750KB Concerning
🔴 red > 750KB Approaching 1.5MB etcd limit (cut in half to allow space for update)

@stuggi

stuggi commented Oct 28, 2026

Copy link
Copy Markdown
Contributor

/test functional

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/124b5de98e2341849b4079efe159bb26

❌ openstack-k8s-operators-content-provider FAILURE in 20m 42s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ openstack-operator-edpm-baremetal-minor-update SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider (non-voting)

@stuggi

stuggi commented Oct 29, 2026

Copy link
Copy Markdown
Contributor

recheck

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build succeeded (check pipeline).
https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/1ea11d9ff5764449a714aba7fc01cb65

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 21m 29s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 20m 16s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 27m 49s
✔️ openstack-operator-tempest-multinode SUCCESS in 1h 45m 06s
✔️ openstack-operator-edpm-baremetal-minor-update SUCCESS in 1h 53m 44s (non-voting)

Warning:
File ansible/tmp/a43b08ebb9d8471481dd58967eb41cfb found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job podified-multinode-edpm-deployment-crc. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/8a241f5d05524b78bfb9c1eb27d8466f found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job podified-multinode-edpm-deployment-crc. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/a43b08ebb9d8471481dd58967eb41cfb found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job podified-multinode-edpm-deployment-crc. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/8a241f5d05524b78bfb9c1eb27d8466f found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job podified-multinode-edpm-deployment-crc. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/a43b08ebb9d8471481dd58967eb41cfb found in build home directory during playbook review.rdoproject.org/config/playbooks/crc/print-machineconfigpool.yaml for job podified-multinode-edpm-deployment-crc. Add to preserve-home-paths if safe, or otherwise remove.
File .ssh/known_hosts.old found in build home directory during playbook review.rdoproject.org/config/playbooks/base-minimal/post-logs.yaml for job podified-multinode-edpm-deployment-crc. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/f93b53a8c766456ea7796d49a6f206e7 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job cifmw-crc-podified-edpm-baremetal. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/1336a91008cf4950aa127b73f31f7490 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job cifmw-crc-podified-edpm-baremetal. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/e91c7947922a46c29016c9eee985e503 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job cifmw-crc-podified-edpm-baremetal. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/7127966a250a4e0488d4a78425314960 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job cifmw-crc-podified-edpm-baremetal. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/ce58d85c08984da28ad0639d033f620f found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job cifmw-crc-podified-edpm-baremetal. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/26794fd847784b1ca7d6020f0c754ac0 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job openstack-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/cfa515d017f8449dabf8595d02e298fa found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job openstack-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/26794fd847784b1ca7d6020f0c754ac0 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job openstack-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/cfa515d017f8449dabf8595d02e298fa found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/multinode-autohold.yml for job openstack-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/26794fd847784b1ca7d6020f0c754ac0 found in build home directory during playbook review.rdoproject.org/config/playbooks/crc/print-machineconfigpool.yaml for job openstack-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File .ssh/known_hosts.old found in build home directory during playbook review.rdoproject.org/config/playbooks/base-minimal/post-logs.yaml for job openstack-operator-tempest-multinode. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/c8500c072eed4555bb44ede0ac840a46 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job openstack-operator-edpm-baremetal-minor-update. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/a1d1e11161524fc1a6ad4d582bc51045 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job openstack-operator-edpm-baremetal-minor-update. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/46bf6cb1c12549f19abe9511c096fdca found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job openstack-operator-edpm-baremetal-minor-update. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/17b07ac16afb4d64a280456edefe6f54 found in build home directory during playbook github.com/openstack-k8s-operators/ci-framework/ci/playbooks/collect-logs.yml for job openstack-operator-edpm-baremetal-minor-update. Add to preserve-home-paths if safe, or otherwise remove.
File ansible/tmp/c8500c072eed4555bb44ede0ac840a46 found in build home directory during playbook review.rdoproject.org/config/playbooks/ci-framework-rdo-base/dlrn/dlrn-report.yaml for job openstack-operator-edpm-baremetal-minor-update. Add to preserve-home-paths if safe, or otherwise remove.

@stuggi stuggi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Oct 29, 2026
@openshift-ci

openshift-ci Bot commented Oct 29, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, stuggi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot
openshift-merge-bot Bot merged commit 1410ddb into openstack-k8s-operators:18.0-fr7 Oct 29, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants