[release-4.21] OCPBUGS-77432, OCPBUGS-77433: Ensure canary cert matches the default ingress controller's cert

[openshift-cherrypick-robot]

This is an automated cherry-pick of #1334

/assign rfredette

[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.

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
• Post copyable unit tests in a comment

Tip

Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs).
Share your feedback on Discord.

---

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

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-9037 has been cloned as Jira Issue OCPBUGS-77432. Will retitle bug to link to clone.

Jira Issue OCPBUGS-64565 has been cloned as Jira Issue OCPBUGS-77433. Will retitle bug to link to clone.
/retitle [release-4.21] OCPBUGS-77432, OCPBUGS-77433: Ensure canary cert matches the default ingress controller's cert

Details

In response to this:

This is an automated cherry-pick of #1334

/assign rfredette

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-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-77432, 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.21.z) matches configured target version for branch (4.21.z)
• 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-9037 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-9037 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
• bug has dependents

Requesting review from QA contact:
/cc @lihongan

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

This pull request references Jira Issue OCPBUGS-77433, 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.21.z) matches configured target version for branch (4.21.z)
• 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-64565 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-64565 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
• bug has dependents

Requesting review from QA contact:
/cc @lihongan

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 #1334

/assign rfredette

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.

[lihongan]

/retest-required

[openshift-ci]

@openshift-cherrypick-robot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-pre-release-ossm	f88e73d	link	false	/test e2e-aws-pre-release-ossm

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.

[alebedev87]

This is a clean cherry pick of #1334.

/lgtm
/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alebedev87

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 [alebedev87]

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

[lihongan]

pre-merge verified and pass

$ oc get clusterversion
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.21.0-0-2026-02-27-124533-test-ci-ln-bb1n1qt-latest   True        False         3m10s   Cluster version is 4.21.0-0-2026-02-27-124533-test-ci-ln-bb1n1qt-latest

$ curl https://canary-openshift-ingress-canary.apps.ci-ln-bb1n1qt-76ef8.aws-4.ci.openshift.org -kv
<......>
* Server certificate:
*  subject: CN=*.apps.ci-ln-bb1n1qt-76ef8.aws-4.ci.openshift.org
*  start date: Feb 27 13:12:40 2026 GMT
*  expire date: Feb 27 13:12:41 2028 GMT
*  issuer: CN=ingress-operator@1772197956
<......>

/verified by @lihongan

[openshift-ci-robot]

@lihongan: This PR has been marked as verified by @lihongan.

Details

In response to this:

pre-merge verified and pass

$ oc get clusterversion
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.21.0-0-2026-02-27-124533-test-ci-ln-bb1n1qt-latest   True        False         3m10s   Cluster version is 4.21.0-0-2026-02-27-124533-test-ci-ln-bb1n1qt-latest

$ curl https://canary-openshift-ingress-canary.apps.ci-ln-bb1n1qt-76ef8.aws-4.ci.openshift.org -kv
<......>
* Server certificate:
*  subject: CN=*.apps.ci-ln-bb1n1qt-76ef8.aws-4.ci.openshift.org
*  start date: Feb 27 13:12:40 2026 GMT
*  expire date: Feb 27 13:12:41 2028 GMT
*  issuer: CN=ingress-operator@1772197956
<......>

/verified by @lihongan

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.

[candita]

This adds a missing component to a previous fix of the internal canary route. Since this is an internal component it should have a minimal effect for customers using supported configurations.

/label backport-risk-assessed

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-77432
✔️ 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-77432 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Jira Issue Verification Checks: Jira Issue OCPBUGS-77433
✔️ 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-77433 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 #1334

/assign rfredette

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 accepted release 4.21.0-0.nightly-2026-03-01-213049