OCPBUGS-94016: Revendor CAPO by danchild · Pull Request #172 · openshift/machine-api-provider-openstack

danchild · 2026-07-06T13:58:00Z

Copy of #170 for OCP release-4.20

Backporting fix to OCPBUGS-77061. The patch was applied to downstream CAPO on release-0.90 openshift/cluster-api-provider-openstack/pull/421; so, the patch must now be applied to MAPO through vendoring.

Used to backport openshift#170 to OCP release-4.20 Signed-off-by: Dan Childers <dchilder@redhat.com>

openshift-ci-robot · 2026-07-06T13:58:07Z

@danchild: This pull request references Jira Issue OCPBUGS-94016, which is invalid:

expected the bug to target either version "5.0." or "openshift-5.0.", but it targets "4.20.z" 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:

Copy of #170 for OCP release-4.20

Backporting fix to OCPBUGS-77061 on OCP release-4.20. Patch was applied to downstream CAPO on release-0.90 openshift/cluster-api-provider-openstack/pull/421; so, the patch must now be applied to MAPO through vendoring.

Signed-off-by: Dan Childers dchilder@redhat.com

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 · 2026-07-06T13:58:10Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

coderabbitai · 2026-07-06T13:58:11Z

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: 2c03778a-935b-4f66-989e-8b20e8b66667

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

openshift-ci-robot · 2026-07-06T13:59:16Z

@danchild: This pull request references Jira Issue OCPBUGS-94016, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected Jira Issue OCPBUGS-94016 to depend on a bug targeting a version in 4.21.0, 4.21.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

Details

In response to this:

Copy of #170 for OCP release-4.20

Backporting fix to OCPBUGS-77061 on OCP release-4.20. Patch was applied to downstream CAPO on release-0.90 openshift/cluster-api-provider-openstack/pull/421; so, the patch must now be applied to MAPO through vendoring.

Signed-off-by: Dan Childers dchilder@redhat.com

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.

danchild · 2026-07-06T14:03:04Z

/assign @mandre

mandre

Clean backport
/lgtm
/approve
/label backport-risk-assessed

danchild · 2026-07-07T15:11:45Z

/verified by @danchild

openshift-ci-robot · 2026-07-07T15:11:57Z

@danchild: This PR has been marked as verified by @danchild.

Details

In response to this:

/verified by @danchild

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.

danchild · 2026-07-07T15:55:03Z

/jira refresh

openshift-ci-robot · 2026-07-07T15:55:15Z

@danchild: This pull request references Jira Issue OCPBUGS-94016, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected Jira Issue OCPBUGS-94016 to depend on a bug targeting a version in 4.21.0, 4.21.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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:

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

danchild · 2026-07-07T15:56:29Z

/jira refresh

openshift-ci-robot · 2026-07-07T15:56:41Z

@danchild: This pull request references Jira Issue OCPBUGS-94016, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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.

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.

ekuris-redhat · 2026-07-07T18:22:55Z

/test e2e-openstack

openshift-ci · 2026-07-07T21:50:13Z

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

ekuris-redhat

/lgtm

openshift-ci · 2026-07-08T07:07:26Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danchild, ekuris-redhat, mandre

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~~ [mandre]

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

Replace vendored upstream CAPO with downstream CAPO

7b1fc53

Used to backport openshift#170 to OCP release-4.20 Signed-off-by: Dan Childers <dchilder@redhat.com>

openshift-ci-robot added 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 6, 2026

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 6, 2026

openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 6, 2026

danchild changed the base branch from main to release-4.20 July 6, 2026 13:59

danchild marked this pull request as ready for review July 6, 2026 14:00

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 6, 2026

openshift-ci Bot requested review from gryf and stephenfin July 6, 2026 14:01

openshift-ci Bot assigned mandre Jul 6, 2026

danchild changed the title ~~OCPBUGS-94016: Backport fix #170 to release-4.20~~ OCPBUGS-94016: Revendor CAPO Jul 6, 2026

mandre reviewed Jul 6, 2026

View reviewed changes

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

openshift-ci Bot assigned imatza-rh and itzikb-redhat Jul 6, 2026

openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 6, 2026

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

ekuris-redhat approved these changes Jul 8, 2026

View reviewed changes

openshift-ci Bot assigned ekuris-redhat Jul 8, 2026

Uh oh!

Conversation

danchild commented Jul 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Jul 6, 2026

Uh oh!

openshift-ci Bot commented Jul 6, 2026

Uh oh!

coderabbitai Bot commented Jul 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci-robot commented Jul 6, 2026

Uh oh!

danchild commented Jul 6, 2026

Uh oh!

mandre left a comment

Choose a reason for hiding this comment

Uh oh!

danchild commented Jul 7, 2026

Uh oh!

openshift-ci-robot commented Jul 7, 2026

Uh oh!

danchild commented Jul 7, 2026

Uh oh!

openshift-ci-robot commented Jul 7, 2026

Uh oh!

danchild commented Jul 7, 2026

Uh oh!

openshift-ci-robot commented Jul 7, 2026

Uh oh!

ekuris-redhat commented Jul 7, 2026

Uh oh!

openshift-ci Bot commented Jul 7, 2026

Uh oh!

ekuris-redhat left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Jul 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

danchild commented Jul 6, 2026 •

edited

Loading

coderabbitai Bot commented Jul 6, 2026 •

edited

Loading