[release-4.21] OCPBUGS-86295: CAPI image overrides aware of registry config by openshift-cherrypick-robot · Pull Request #8559 · openshift/hypershift

openshift-cherrypick-robot · 2026-05-20T17:52:39Z

This is an automated cherry-pick of #7575

/assign clebs

- capi image overrides now apply registry overrides by using the registry Provider instead of being hardcoded. - the override version has been pinned to 4.20.12 Signed-off-by: Borja Clemente <bclement@redhat.com>

coderabbitai · 2026-05-20T17:52:48Z

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: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: af25313f-0033-429b-b1ab-31b0ae25eaee

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 and usage tips.}

openshift-ci-robot · 2026-05-20T17:53:51Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-74247 has been cloned as Jira Issue OCPBUGS-86295. Will retitle bug to link to clone.
/retitle [release-4.21] OCPBUGS-86295: CAPI image overrides aware of registry config

Details

In response to this:

This is an automated cherry-pick of #7575

/assign clebs

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 · 2026-05-20T17:54:03Z

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

expected dependent Jira Issue OCPBUGS-74247 to target a version in 4.22.0, but it targets "4.22" 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 #7575

/assign clebs

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.

clebs · 2026-05-20T18:00:47Z

/jira refresh

openshift-ci-robot · 2026-05-20T18:00:55Z

@clebs: This pull request references Jira Issue OCPBUGS-86295, 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-74247 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-74247 targets the "4.22.0" version, which is one of the valid target versions: 4.22.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.

jparrill · 2026-06-15T10:46:50Z

/retest

jparrill · 2026-06-15T10:48:22Z

/approve

openshift-ci · 2026-06-15T10:48:59Z

[APPROVALNOTIFIER] This PR is APPROVED

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

~~OWNERS~~ [jparrill]

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

clebs · 2026-06-15T12:47:57Z

/test e2e-aws e2e-kubevirt-aws-ovn-reduced

clebs · 2026-06-29T10:22:48Z

/test e2e-kubevirt-aws-ovn-reduced e2e-aws

clebs · 2026-06-30T10:13:55Z

/test e2e-aws

clebs · 2026-06-30T15:04:02Z

/verified on main and 4.22

openshift-ci-robot · 2026-06-30T15:04:05Z

@clebs: The /verified command must be used with one of the following actions: by, later, remove, or bypass. See https://docs.ci.openshift.org/docs/architecture/jira/#premerge-verification for more information.

Details

In response to this:

/verified on main and 4.22

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.

clebs · 2026-06-30T15:05:31Z

/verified by previous backport to 4.22

openshift-ci-robot · 2026-06-30T15:05:44Z

@clebs: This PR has been marked as verified by previous backport to 4.22.

Details

In response to this:

/verified by previous backport to 4.22

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 · 2026-06-30T15:15:17Z

/backport-risk-assessed

enxebre · 2026-07-09T13:02:31Z

/lgtm

openshift-merge-bot · 2026-07-09T14:57:28Z

/retest-required

Remaining retests: 0 against base HEAD c84f807 and 2 for PR HEAD e83a605 in total

openshift-merge-bot · 2026-07-09T22:08:52Z

/retest-required

Remaining retests: 0 against base HEAD b5439e4 and 1 for PR HEAD e83a605 in total

clebs · 2026-07-10T06:48:17Z

/test e2e-kubevirt-aws-ovn-reduced

openshift-ci · 2026-07-10T13:02:04Z

@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-ci-robot · 2026-07-10T13:05:42Z

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-86295
✔️ 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-86295 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 #7575

/assign clebs

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 · 2026-07-11T08:44:01Z

Fix included in release 4.21.0-0.nightly-2026-07-11-011255

Documents the layered CAPI provider image resolution (payload, env var, annotation), per-platform behavior, and the backward compatibility pinning to 4.20.10 for CAPI v1beta2 on release-4.21 and release-4.22. References: - OCPBUGS-74247 / PR openshift#7575 (initial implementation) - OCPBUGS-86295 / PR openshift#8559 (backport to release-4.21) - CNTRLPLANE-1200 (v1beta2 migration tracking) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

fix(OCPBUGS-74247): capi image overrides respect config

e83a605

- capi image overrides now apply registry overrides by using the registry Provider instead of being hardcoded. - the override version has been pinned to 4.20.12 Signed-off-by: Borja Clemente <bclement@redhat.com>

openshift-cherrypick-robot assigned clebs May 20, 2026

openshift-cherrypick-robot mentioned this pull request May 20, 2026

OCPBUGS-74247: CAPI image overrides aware of registry config #7575

Merged

4 tasks

openshift-ci Bot added the do-not-merge/needs-area label May 20, 2026

openshift-ci Bot requested review from devguyio and jparrill May 20, 2026 17:53

openshift-ci Bot changed the title ~~[release-4.21] OCPBUGS-74247: CAPI image overrides aware of registry config~~ [release-4.21] OCPBUGS-86295: CAPI image overrides aware of registry config May 20, 2026

openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels May 20, 2026

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label May 20, 2026

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 May 20, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 15, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 30, 2026

enxebre added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jul 9, 2026

openshift-ci Bot assigned enxebre Jul 9, 2026

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

openshift-merge-bot Bot merged commit c975abb into openshift:release-4.21 Jul 10, 2026
17 checks passed

Uh oh!

Conversation

openshift-cherrypick-robot commented May 20, 2026

Uh oh!

coderabbitai Bot commented May 20, 2026

Review skipped

Uh oh!

openshift-ci-robot commented May 20, 2026

Uh oh!

openshift-ci-robot commented May 20, 2026

Uh oh!

clebs commented May 20, 2026

Uh oh!

openshift-ci-robot commented May 20, 2026

Uh oh!

jparrill commented Jun 15, 2026

Uh oh!

jparrill commented Jun 15, 2026

Uh oh!

openshift-ci Bot commented Jun 15, 2026

Uh oh!

clebs commented Jun 15, 2026

Uh oh!

clebs commented Jun 29, 2026

Uh oh!

clebs commented Jun 30, 2026

Uh oh!

clebs commented Jun 30, 2026

Uh oh!

openshift-ci-robot commented Jun 30, 2026

Uh oh!

clebs commented Jun 30, 2026

Uh oh!

openshift-ci-robot commented Jun 30, 2026

Uh oh!

jparrill commented Jun 30, 2026

Uh oh!

enxebre commented Jul 9, 2026

Uh oh!

openshift-merge-bot Bot commented Jul 9, 2026

Uh oh!

openshift-merge-bot Bot commented Jul 9, 2026

Uh oh!

clebs commented Jul 10, 2026

Uh oh!

openshift-ci Bot commented Jul 10, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jul 10, 2026

Uh oh!

openshift-merge-robot commented Jul 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants