OCPBUGS-98695: add Azure CPO overrides for 4.22#9010
Conversation
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)
|
Pipeline controller notification For optional jobs, comment This repository is configured in: LGTM mode |
|
@celebdor: This pull request references Jira Issue OCPBUGS-98695, which is valid. 3 validation(s) were run on this bug
The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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. |
📝 WalkthroughWalkthroughThe 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 Possibly related PRs
🚥 Pre-merge checks | ✅ 11✅ Passed checks (11 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
There was a problem hiding this comment.
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
📒 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 |
There was a problem hiding this comment.
📐 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.
|
/label acknowledge-critical-fixes-only |
|
/approve |
|
/verified by @ahitacat |
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@jparrill: This PR has been marked as verified by DetailsIn response to this:
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 Report✅ All modified and coverable lines are covered by tests. 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
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
|
/lgtm |
|
Scheduling tests matching the |
|
/override ci/prow/e2e-aws-4-22 These overrides have zero impact on AWS |
|
@csrwng: Overrode contexts on behalf of csrwng: ci/prow/e2e-aws-4-22, ci/prow/e2e-aws-override DetailsIn response to this:
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. |
|
/test images |
|
/test e2e-aks-override |
1 similar comment
|
/test e2e-aks-override |
|
/hold Revision 751ce18 was retested 3 times: holding |
|
/retest-required The change it's an override for Azure so AWS should not be failing. Assuming CI Flakes |
|
/hold cancel |
|
/override "ci/prow/e2e-aws-override" |
|
@bryan-cox: Overrode contexts on behalf of bryan-cox: ci/prow/e2e-aws-override DetailsIn response to this:
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. |
|
@celebdor: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
@celebdor: Jira Issue Verification Checks: Jira Issue OCPBUGS-98695 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. 🕓 DetailsIn response to this:
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. |
|
Fix included in release 5.0.0-0.nightly-2026-07-18-135359 |
Summary
awsplatform instead ofazurebranch: 4.22 wants: #8721, #8790, #8972, #8998
Test plan
go test ./hypershift-operator/controlplaneoperator-overrides/...)verify-pr-in-image.sh/validate-pr-override-imagespasses against this PR🤖 Generated with Claude Code
Summary by CodeRabbit