[release-4.15] OCPBUGS-57121: Add validation to avoid conflicts between KubeAPIServer and NamedCertificates SANs

[jparrill]

What this PR does / why we need it

• Manual backport of [release-4.16] OCPBUGS-55697: Add validation to avoid conflicts between KubeAPIServer and NamedCertificates SANs #6114

Which issue(s) this PR fixes

• OCPBUGS-57121
• RHOCPPRIO-433

[openshift-ci-robot]

@jparrill: This pull request references Jira Issue OCPBUGS-57121, which is invalid:

• expected dependent Jira Issue OCPBUGS-55697 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

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:

What this PR does / why we need it

• Manual backport of [release-4.16] OCPBUGS-55697: Add validation to avoid conflicts between KubeAPIServer and NamedCertificates SANs #6114

Which issue(s) this PR fixes

• OCPBUGS-57121
• RHOCPPRIO-433

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

This pull-request has been approved by: jparrill

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

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

[jparrill]

/retest

[openshift-ci]

@jparrill: 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.

[sjenning]

/label backport-risk-assessed
/label cherry-pick-approved

[jparrill]

/jira refresh

[openshift-ci-robot]

@jparrill: An error was encountered updating to the POST state for bug OCPBUGS-57121 on the Jira server at https://issues.redhat.com/. No known errors were detected, please see the full error message for details.

Full error message.

No response returned: Post "https://issues.redhat.com/rest/api/2/issue/17037748/transitions": POST https://issues.redhat.com/rest/api/2/issue/17037748/transitions giving up after 5 attempt(s)

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

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.

[jparrill]

/retest

[jparrill]

/jira refresh

[openshift-ci-robot]

@jparrill: This pull request references Jira Issue OCPBUGS-57121, 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.15.z) matches configured target version for branch (4.15.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-55697 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-55697 targets the "4.16.z" version, which is one of the valid target versions: 4.16.0, 4.16.z
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (yli2@redhat.com), skipping review request.

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.

[enxebre]

/lgtm

[openshift-ci-robot]

@jparrill: Jira Issue OCPBUGS-57121: All pull requests linked via external trackers have merged:

• openshift/hypershift#6231

Jira Issue OCPBUGS-57121 has been moved to the MODIFIED state.

Details

In response to this:

What this PR does / why we need it

• Manual backport of [release-4.16] OCPBUGS-55697: Add validation to avoid conflicts between KubeAPIServer and NamedCertificates SANs #6114

Which issue(s) this PR fixes

• OCPBUGS-57121
• RHOCPPRIO-433

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

[ART PR BUILD NOTIFIER]

Distgit: hypershift
This PR has been included in build ose-hypershift-container-v4.15.0-202506102009.p0.g25ecbce.assembly.stream.el9.
All builds following this will include this PR.

[openshift-merge-robot]

Fix included in accepted release 4.15.0-0.nightly-2025-06-10-222616

[jparrill]

/jira backport release-4.14

[openshift-ci-robot]

@jparrill: The following backport issues have been created:

• OCPBUGS-57321 for branch release-4.14

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.14

Details

In response to this:

/jira backport release-4.14

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

@openshift-ci-robot: #6231 failed to apply on top of branch "release-4.14":

Applying: OCPBUGS-53261: Add validation to avoid conflicts between KubeAPIServer and NamedCertificates SANs
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
M	control-plane-operator/controllers/hostedcontrolplane/pki/kas.go
M	go.mod
M	go.sum
M	hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
Auto-merging control-plane-operator/controllers/hostedcontrolplane/pki/kas.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-53261: Add validation to avoid conflicts between KubeAPIServer and NamedCertificates SANs

Details

In response to this:

@jparrill: The following backport issues have been created:

• OCPBUGS-57321 for branch release-4.14

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.14

In response to this:

/jira backport release-4.14

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.

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.