Skip to content

OCPBUGS-98695: add Azure CPO overrides for 4.22#9010

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
celebdor:aro-422-cpo-override-azure
Jul 17, 2026
Merged

OCPBUGS-98695: add Azure CPO overrides for 4.22#9010
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
celebdor:aro-422-cpo-override-azure

Conversation

@celebdor

@celebdor celebdor commented Jul 15, 2026

Copy link
Copy Markdown
Collaborator

Summary

branch: 4.22 wants: #8721, #8790, #8972, #8998

Test plan

  • Unit tests pass (go test ./hypershift-operator/controlplaneoperator-overrides/...)
  • All 4 PRs verified present in override image via verify-pr-in-image.sh
  • Override image is publicly pullable from quay.io
  • /validate-pr-override-images passes against this PR

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Bug Fixes
    • Updated Azure control plane operator images for OpenShift 4.22.0–4.22.6.
    • Refreshed Azure testing image references to use OpenShift 4.22.5 and 4.21.24 releases.
    • Updated release annotations and override guidance for newer OpenShift 4.22 versions.

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)
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 15, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@celebdor: This pull request references Jira Issue OCPBUGS-98695, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

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

Details

In response to this:

Summary

branch: 4.22 wants: #8721, #8790, #8972, #8998

Test plan

  • Unit tests pass (go test ./hypershift-operator/controlplaneoperator-overrides/...)
  • All 4 PRs verified present in override image via verify-pr-in-image.sh
  • Override image is publicly pullable from quay.io
  • /validate-pr-override-images passes against this PR

🤖 Generated with Claude Code

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 jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jul 15, 2026
@coderabbitai

coderabbitai Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

The Azure OpenShift 4.22 override configuration now uses a replacement control-plane-operator image digest for versions 4.22.0–4.22.3 and adds overrides for versions 4.22.4–4.22.6. Related comments identify the updated image/build and later versions without overrides. Azure override testing now uses OpenShift release images tagged 4.22.5 as latest and 4.21.24 as previous.

Possibly related PRs

🚥 Pre-merge checks | ✅ 11
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the main change: adding Azure CPO overrides for OpenShift 4.22 under the linked bug.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR only changes a YAML overrides file; no Ginkgo test titles were added or modified, so no unstable names are introduced.
Test Structure And Quality ✅ Passed PR changes only overrides.yaml; no Ginkgo test code was added or modified, so the test-structure review is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Only image override/test YAML changed; no pod specs, replicas, affinities, selectors, or topology logic were added.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR only updates overrides.yaml; no new Ginkgo e2e tests or test bodies were added to assess for IPv4/public-network assumptions.
No-Weak-Crypto ✅ Passed Diff only updates YAML image refs/comments; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB or custom crypto/comparison code appears.
Container-Privileges ✅ Passed PR only edits overrides.yaml image refs/comments; no privileged, host* , SYS_ADMIN, or allowPrivilegeEscalation settings are present.
No-Sensitive-Data-In-Logs ✅ Passed Changed file only updates image overrides and comments; no logging statements or secret/PII fields appear in the diff.
✨ 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 added the area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release label Jul 15, 2026
@openshift-ci
openshift-ci Bot requested review from jparrill and sdminonne July 15, 2026 08:56

@coderabbitai coderabbitai Bot 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.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@hypershift-operator/controlplaneoperator-overrides/assets/overrides.yaml`:
- Line 106: Remove or update the stale comment immediately preceding the
“Beginning of CNTRLPLANE-3619/CNTRLPLANE-3656/OCPBUGS-98627/OCPBUGS-98220
overrides 4.22 section” so it no longer claims 4.22 requires no override and
accurately reflects the 4.22.0–4.22.6 overrides.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: abfd93c4-0942-4e7b-9f52-8d81882990c2

📥 Commits

Reviewing files that changed from the base of the PR and between efc9e04 and 751ce18.

📒 Files selected for processing (1)
  • hypershift-operator/controlplaneoperator-overrides/assets/overrides.yaml

# 4.22 does not need an override: the fix (PR #8564) landed before rc.5
# (SOURCE_GIT_COMMIT=d6c72d15350752e315c198f7a68558ae4086e3c7) and GA will include it.
# Beginning of CNTRLPLANE-3619/CNTRLPLANE-3656 overrides 4.22 section
# Beginning of CNTRLPLANE-3619/CNTRLPLANE-3656/OCPBUGS-98627/OCPBUGS-98220 overrides 4.22 section

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.

📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

Remove the stale “4.22 does not need an override” note.

Lines 104-105 still claim that 4.22 requires no override, directly contradicting this new override section. Update or remove that comment so the configuration history accurately reflects the 4.22.0–4.22.6 overrides.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@hypershift-operator/controlplaneoperator-overrides/assets/overrides.yaml` at
line 106, Remove or update the stale comment immediately preceding the
“Beginning of CNTRLPLANE-3619/CNTRLPLANE-3656/OCPBUGS-98627/OCPBUGS-98220
overrides 4.22 section” so it no longer claims 4.22 requires no override and
accurately reflects the 4.22.0–4.22.6 overrides.

@jparrill

Copy link
Copy Markdown
Contributor

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci Bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Jul 15, 2026
@jparrill

Copy link
Copy Markdown
Contributor

/approve

@jparrill

Copy link
Copy Markdown
Contributor

/verified by @ahitacat

@openshift-ci

openshift-ci Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

Copy link
Copy Markdown

@jparrill: This PR has been marked as verified by @ahitacat.

Details

In response to this:

/verified by @ahitacat

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 15, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 44.11%. Comparing base (efc9e04) to head (751ce18).
⚠️ Report is 38 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #9010   +/-   ##
=======================================
  Coverage   44.11%   44.11%           
=======================================
  Files         772      772           
  Lines       96226    96226           
=======================================
  Hits        42448    42448           
  Misses      50832    50832           
  Partials     2946     2946           
Flag Coverage Δ
cmd-support 38.24% <ø> (ø)
cpo-hostedcontrolplane 46.16% <ø> (ø)
cpo-other 45.13% <ø> (ø)
hypershift-operator 54.09% <ø> (ø)
other 32.12% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@enxebre

enxebre commented Jul 15, 2026

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2026
@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-4-22
/test e2e-aws-4-22

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 7eb0da0 and 2 for PR HEAD 751ce18 in total

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 4fa09b1 and 1 for PR HEAD 751ce18 in total

@csrwng

csrwng commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

/override ci/prow/e2e-aws-4-22
/override ci/prow/e2e-aws-override

These overrides have zero impact on AWS

@openshift-ci

openshift-ci Bot commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

@csrwng: Overrode contexts on behalf of csrwng: ci/prow/e2e-aws-4-22, ci/prow/e2e-aws-override

Details

In response to this:

/override ci/prow/e2e-aws-4-22
/override ci/prow/e2e-aws-override

These overrides have zero impact on AWS

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.

@csrwng

csrwng commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

/test images

@zgalor

zgalor commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

/test e2e-aks-override

1 similar comment
@zgalor

zgalor commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

/test e2e-aks-override

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 3eefe36 and 0 for PR HEAD 751ce18 in total

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/hold

Revision 751ce18 was retested 3 times: holding

@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 16, 2026
@jparrill

Copy link
Copy Markdown
Contributor

/retest-required

The change it's an override for Azure so AWS should not be failing. Assuming CI Flakes

@jparrill

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 17, 2026
@bryan-cox

Copy link
Copy Markdown
Member

/override "ci/prow/e2e-aws-override"

@openshift-ci

openshift-ci Bot commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

@bryan-cox: Overrode contexts on behalf of bryan-cox: ci/prow/e2e-aws-override

Details

In response to this:

/override "ci/prow/e2e-aws-override"

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.

@openshift-ci

openshift-ci Bot commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

@celebdor: 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 82049c6 into openshift:main Jul 17, 2026
36 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@celebdor: Jira Issue Verification Checks: Jira Issue OCPBUGS-98695
✔️ 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-98695 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:

Summary

branch: 4.22 wants: #8721, #8790, #8972, #8998

Test plan

  • Unit tests pass (go test ./hypershift-operator/controlplaneoperator-overrides/...)
  • All 4 PRs verified present in override image via verify-pr-in-image.sh
  • Override image is publicly pullable from quay.io
  • /validate-pr-override-images passes against this PR

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Bug Fixes
  • Updated Azure control plane operator images for OpenShift 4.22.0–4.22.6.
  • Refreshed Azure testing image references to use OpenShift 4.22.5 and 4.21.24 releases.
  • Updated release annotations and override guidance for newer OpenShift 4.22 versions.

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

Copy link
Copy Markdown
Contributor

Fix included in release 5.0.0-0.nightly-2026-07-18-135359

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release 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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants