Skip to content

[release-4.22] OCPBUGS-98627: Skip Azure topology LB scope override for ARO HCP IngressController - #8998

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-8992-to-release-4.22
Jul 15, 2026
Merged

[release-4.22] OCPBUGS-98627: Skip Azure topology LB scope override for ARO HCP IngressController#8998
openshift-merge-bot[bot] merged 2 commits into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-8992-to-release-4.22

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #8992

/assign openshift-ci-robot

zgalor and others added 2 commits July 14, 2026 12:23
…logy

PR openshift#7821 (CNTRLPLANE-2172) added code to force InternalLoadBalancer
scope on the guest-cluster IngressController for Azure clusters with
Private or PublicAndPrivate topology. This was correct for self-managed
Azure but also affected ARO HCP clusters, which use shared ingress and
should keep ExternalLoadBalancer scope (or defer to the annotation set
by Cluster Service).

Add an IsAroHCPByHCP guard so the topology-based scope override only
applies to self-managed Azure. ARO HCP clusters now respect the
IngressControllerLoadBalancerScope annotation propagated from the
HostedCluster, matching the pattern already used in router.go.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Cover the ARO HCP guard added in the previous commit:
- PublicAndPrivate topology → ExternalLoadBalancer (not Internal)
- Private topology → ExternalLoadBalancer (shared ingress)
- Annotation override to Internal is still respected

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-98571 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-4.22] OCPBUGS-98627: Skip Azure topology LB scope override for ARO HCP IngressController

Details

In response to this:

This is an automated cherry-pick of #8992

/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

coderabbitai Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

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: fae8131c-7f71-4512-8bf2-092fdcf6f2c0

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.

@openshift-ci openshift-ci Bot changed the title [release-4.22] OCPBUGS-98571: Skip Azure topology LB scope override for ARO HCP IngressController [release-4.22] OCPBUGS-98627: Skip Azure topology LB scope override for ARO HCP IngressController Jul 14, 2026
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 14, 2026
@openshift-ci-robot

Copy link
Copy Markdown

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

  • expected dependent Jira Issue OCPBUGS-98571 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is ASSIGNED 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:

This is an automated cherry-pick of #8992

/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-ci
openshift-ci Bot requested review from cblecker and enxebre July 14, 2026 12:24
@openshift-ci openshift-ci Bot added the area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release label Jul 14, 2026
@bryan-cox

Copy link
Copy Markdown
Member

/approve
/lgtm

clean backport

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 14, 2026
@openshift-ci

openshift-ci Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox, 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:

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-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 14, 2026
@bryan-cox

Copy link
Copy Markdown
Member

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 14, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@bryan-cox: This pull request references Jira Issue OCPBUGS-98627, 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 ASSIGNED, 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-98571 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-98571 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.

@codecov

codecov Bot commented Jul 14, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 35.87%. Comparing base (13ae391) to head (db402ad).
⚠️ Report is 4 commits behind head on release-4.22.

Additional details and impacted files
@@              Coverage Diff              @@
##           release-4.22    #8998   +/-   ##
=============================================
  Coverage         35.87%   35.87%           
=============================================
  Files               774      774           
  Lines             94752    94753    +1     
=============================================
+ Hits              33993    33997    +4     
+ Misses            57979    57977    -2     
+ Partials           2780     2779    -1     
Files with missing lines Coverage Δ
...igoperator/controllers/resources/ingress/params.go 87.75% <100.00%> (+6.50%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@bryan-cox

Copy link
Copy Markdown
Member

/hold

For openshift/release#81855

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 14, 2026
@bryan-cox

Copy link
Copy Markdown
Member

/test e2e-aks

@csrwng csrwng added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jul 14, 2026
@bryan-cox

Copy link
Copy Markdown
Member

/pipeline required

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@cblecker

Copy link
Copy Markdown
Member

/uncc

@openshift-ci
openshift-ci Bot removed the request for review from cblecker July 14, 2026 17:22
@csrwng

csrwng commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 14, 2026
@bryan-cox

Copy link
Copy Markdown
Member

/test e2e-aws

@csrwng

csrwng commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

/verified later @bryan-cox

@openshift-ci-robot

Copy link
Copy Markdown

@csrwng: This PR has been marked to be verified later by @bryan-cox.

Details

In response to this:

/verified later @bryan-cox

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-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 15, 2026
@openshift-ci

openshift-ci Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

@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-merge-bot
openshift-merge-bot Bot merged commit fb3b1a3 into openshift:release-4.22 Jul 15, 2026
24 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue OCPBUGS-98627: All pull requests linked via external trackers have merged:

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-98627 has been moved to the MODIFIED state.

Details

In response to this:

This is an automated cherry-pick of #8992

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

csrwng added a commit to csrwng/hypershift-1 that referenced this pull request Jul 15, 2026
Add AWS CPO image overrides for 4.22.0-4.22.6 to fix KMS key rotation
and related issues.

4.22.7 does not need an override: both PRs (openshift#8972, openshift#8998) merged
before the 4.22.7 development cutoff (2026-07-22).

- 4.22.0-4.22.6: PR openshift#8972, PR openshift#8998

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
csrwng added a commit to csrwng/hypershift-1 that referenced this pull request Jul 15, 2026
Add AWS CPO image overrides for 4.22.0-4.22.6 to fix KMS key rotation
and related issues.

4.22.7 does not need an override: both PRs (openshift#8972, openshift#8998) merged
before the 4.22.7 development cutoff (2026-07-22).

- 4.22.0-4.22.6: PR openshift#8972, PR openshift#8998

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@openshift-merge-robot

Copy link
Copy Markdown
Contributor

Fix included in release 4.22.0-0.nightly-2026-07-15-214410

openshift-merge-bot Bot pushed a commit that referenced this pull request Jul 17, 2026
Add Azure CPO image overrides to fix KMS key rotation (OCPBUGS-98220,
PR #8972) and ARO HCP ingress LB scope (OCPBUGS-98627, PR #8998).

This supersedes the previous CNTRLPLANE-3619/3656 overrides for
4.22.0-4.22.3: the new Konflux image (commit fb3b1a3) includes
all four PRs (#8721, #8790, #8972, #8998).

4.22.7 does not need an override: all PRs merged before the
development cutoff (2026-07-22).

Refs: OCPBUGS-98695
Signed-off-by: Antoni Segura Puimedon <antoni@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
vsolanki12 pushed a commit to vsolanki12/hypershift that referenced this pull request Aug 25, 2026
Add Azure CPO image overrides to fix KMS key rotation (OCPBUGS-98220,
PR openshift#8972) and ARO HCP ingress LB scope (OCPBUGS-98627, PR openshift#8998).

This supersedes the previous CNTRLPLANE-3619/3656 overrides for
4.22.0-4.22.3: the new Konflux image (commit fb3b1a3) includes
all four PRs (openshift#8721, openshift#8790, openshift#8972, openshift#8998).

4.22.7 does not need an override: all PRs merged before the
development cutoff (2026-07-22).

Refs: OCPBUGS-98695
Signed-off-by: Antoni Segura Puimedon <antoni@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
rutvik23 pushed a commit to rutvik23/hypershift that referenced this pull request Aug 26, 2026
Add Azure CPO image overrides to fix KMS key rotation (OCPBUGS-98220,
PR openshift#8972) and ARO HCP ingress LB scope (OCPBUGS-98627, PR openshift#8998).

This supersedes the previous CNTRLPLANE-3619/3656 overrides for
4.22.0-4.22.3: the new Konflux image (commit fb3b1a3) includes
all four PRs (openshift#8721, openshift#8790, openshift#8972, openshift#8998).

4.22.7 does not need an override: all PRs merged before the
development cutoff (2026-07-22).

Refs: OCPBUGS-98695
Signed-off-by: Antoni Segura Puimedon <antoni@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria verified-later

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants