[release-4.22] OCPBUGS-89236: Handle CA bundle aggregation delay by requeuing revocation

[openshift-cherrypick-robot]

This is an automated cherry-pick of #8563

/assign openshift-ci-robot

[openshift-merge-bot]

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

[openshift-ci-robot]

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-86310 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-4.22] OCPBUGS-89236: Handle CA bundle aggregation delay by requeuing revocation

Details

In response to this:

This is an automated cherry-pick of #8563

/assign openshift-ci-robot

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 openshift-eng/jira-lifecycle-plugin repository.

[coderabbitai]

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

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 6355b2ba-b4bd-43ee-830a-392ec9f56bb9

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[openshift-ci-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-89236, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #8563

/assign openshift-ci-robot

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 openshift-eng/jira-lifecycle-plugin repository.

[bryan-cox]

Why we need this on release-4.22

The CRR controller on release-4.22 has a bug where ensureNewSignerCertificatePropagated (line 736) and ensureOldSignerCertificateRevoked (line 1033) return requeue: false when the total-client-ca ConfigMap hasn't been updated yet. This causes the controller to stop reconciling and wait passively for an informer event or the 1-minute periodic resync, which can exceed the e2e test's 10-minute timeout on HA clusters with 3 KAS replicas.

This bug was introduced by commit 706a79490 (per-pod verification refactor) which is on release-4.22. The fix (changing requeue: false to requeue: true on two lines) ensures the controller actively polls for the total-client-ca update instead of sleeping.

Without this fix, TestCreateClusterHABreakGlassCredentials permafails in periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aks.

Bug: https://redhat.atlassian.net/browse/OCPBUGS-86310

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 35.45%. Comparing base (5cb8735) to head (cbe15ed).
⚠️ Report is 21 commits behind head on release-4.22.

Additional details and impacted files

@@              Coverage Diff              @@
##           release-4.22    #8746   +/-   ##
=============================================
  Coverage         35.45%   35.45%           
=============================================
  Files               767      767           
  Lines             93724    93724           
=============================================
+ Hits              33226    33230    +4     
+ Misses            57785    57781    -4     
  Partials           2713     2713           

Files with missing lines	Coverage Δ
...ationcontroller/certificaterevocationcontroller.go	56.00% <100.00%> (+0.44%)	⬆️

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[bryan-cox]

/jira refresh

[openshift-ci-robot]

@bryan-cox: This pull request references Jira Issue OCPBUGS-89236, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-86310 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-86310 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
• bug has dependents

Details

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

[YamunadeviShanmugam]

/lgtm

[openshift-merge-bot]

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-self-managed
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

[YamunadeviShanmugam]

/retest

[bryan-cox]

/retest

[bryan-cox]

/retest

[YamunadeviShanmugam]

/retest

[YamunadeviShanmugam]

/retest

[bryan-cox]

@YamunadeviShanmugam this test is broken. No need to retest for now.

[celebdor]

/test e2e-aws-upgrade-hypershift-operator

[celebdor]

This cherry-pick is verified by CI:

Unit tests (Unit Tests — passed) directly and deterministically validate the fix. Three test cases set up the exact stale CA bundle states that caused the original hang and assert expectedRequeue: true:

• "not yet propagated, nothing to do" — new signer cert not yet in the total CA bundle; before the fix the controller returned requeue=false and stopped making progress
• "validating, previous still valid" — old signer cert still present in the total CA bundle; same requeue=false deadlock before the fix
• "SRE signer: validating, previous still valid (requeue path)" — new test covering the same requeue path for the SRE break-glass signer

These tests reproduce the bug deterministically without relying on a race condition, confirming the controller now requeues and retries until TargetConfigController catches up.

Upgrade (e2e-aws-upgrade-hypershift-operator): validates the patched operator upgrades cleanly without disrupting existing HostedClusters.

Note: the e2e break-glass credential tests exercise the full CRR lifecycle but only catch this bug when the CA bundle propagation race actually triggers — so they are not a reliable reproducer on their own. The ultimate verification will be the absence of this flake in e2e runs over the coming weeks after the backport lands.

/verified by CI

[openshift-ci-robot]

@celebdor: This PR has been marked as verified by CI.

Details

In response to this:

This cherry-pick is verified by CI:

Unit tests (Unit Tests — passed) directly and deterministically validate the fix. Three test cases set up the exact stale CA bundle states that caused the original hang and assert expectedRequeue: true:

• "not yet propagated, nothing to do" — new signer cert not yet in the total CA bundle; before the fix the controller returned requeue=false and stopped making progress
• "validating, previous still valid" — old signer cert still present in the total CA bundle; same requeue=false deadlock before the fix
• "SRE signer: validating, previous still valid (requeue path)" — new test covering the same requeue path for the SRE break-glass signer

These tests reproduce the bug deterministically without relying on a race condition, confirming the controller now requeues and retries until TargetConfigController catches up.

Upgrade (e2e-aws-upgrade-hypershift-operator): validates the patched operator upgrades cleanly without disrupting existing HostedClusters.

Note: the e2e break-glass credential tests exercise the full CRR lifecycle but only catch this bug when the CA bundle propagation race actually triggers — so they are not a reliable reproducer on their own. The ultimate verification will be the absence of this flake in e2e runs over the coming weeks after the backport lands.

/verified by CI

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

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

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:

• OWNERS

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

[openshift-ci]

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-89236
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-89236 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

This is an automated cherry-pick of #8563

/assign openshift-ci-robot

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-merge-robot]

Fix included in release 4.22.0-0.nightly-2026-07-14-080922