Skip to content

OCPBUGS-65712: Re-vendor CAPO #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
openshift-merge-bot merged 1 commit into from
Dec 4, 2025
Merged

OCPBUGS-65712: Re-vendor CAPO #140

openshift-merge-bot merged 1 commit into from
Dec 4, 2025

Conversation

@mandre
Copy link
Member

@mandre mandre commented Nov 20, 2025

Re-vendor CAPO to get fix for deleting instances when OpenStack has a policy in place that prevents detaching the primary interface.

Switch back to upstream CAPO as it now contains all the patches we need.

go get sigs.k8s.io/[email protected]
go mod tidy
go mod vendor

@mandre
OCPBUGS-65712: Re-vendor CAPO
99b6551 
Re-vendor CAPO to get fix for deleting instances when OpenStack has
a policy in place that prevents detaching the primary interface.

Switch back to upstream CAPO as it now contains all the patches we need.

    go get sigs.k8s.io/[email protected]
    go mod tidy
    go mod vendor
@openshift-ci-robot 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 Nov 20, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 20, 2025

@mandre: This pull request references Jira Issue OCPBUGS-65712, which is invalid:

  • expected the bug to target the "4.21.0" version, but no target version was set
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED 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:

Re-vendor CAPO to get fix for deleting instances when OpenStack has a policy in place that prevents detaching the primary interface.

Switch back to upstream CAPO as it now contains all the patches we need.

go get sigs.k8s.io/[email protected]
go mod tidy
go mod vendor

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.

@mandre
Copy link
Member Author

mandre commented Nov 20, 2025

/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 Nov 20, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 20, 2025

@mandre: This pull request references Jira Issue OCPBUGS-65712, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.0) matches configured target version for branch (4.21.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 20, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Nov 20, 2025
@mandre
Copy link
Member Author

mandre commented Nov 21, 2025

/test e2e-openstack

@mandre
Copy link
Member Author

mandre commented Nov 21, 2025

/retest

@mandre
Copy link
Member Author

mandre commented Nov 24, 2025

Looks like the job might be fixed now 🤞
/retest

@mandre
Copy link
Member Author

mandre commented Nov 24, 2025

/test e2e-openstack

1 similar comment
@mandre
Copy link
Member Author

mandre commented Nov 25, 2025

/test e2e-openstack

@mandre
Copy link
Member Author

mandre commented Nov 27, 2025

We got a job that was able to stand up the nodes: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_machine-api-provider-openstack/140/pull-ci-openshift-machine-api-provider-openstack-main-e2e-openstack/1993049172114149376

@stephenfin are we satisfied with these results?

@stephenfin
Copy link
Contributor

stephenfin commented Nov 27, 2025

@stephenfin are we satisfied with these results?

Yup

/approved
/lgtm
/verified by CI jobs

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 27, 2025
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 27, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 27, 2025

@stephenfin: This PR has been marked as verified by CI jobs.

Details

In response to this:

@stephenfin are we satisfied with these results?

Yup

/approved
/lgtm
/verified by CI jobs

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
Copy link
Contributor

openshift-ci-robot commented Nov 27, 2025

/retest-required

Remaining retests: 0 against base HEAD 2011501 and 2 for PR HEAD 99b6551 in total

@stephenfin
Copy link
Contributor

stephenfin commented Nov 28, 2025

/retest-required

1 similar comment
@stephenfin
Copy link
Contributor

stephenfin commented Nov 28, 2025

/retest-required

@mandre
Copy link
Member Author

mandre commented Dec 1, 2025

/test e2e-openstack

2 similar comments
@stephenfin
Copy link
Contributor

stephenfin commented Dec 1, 2025

/test e2e-openstack

@mandre
Copy link
Member Author

mandre commented Dec 3, 2025

/test e2e-openstack

@mandre
Copy link
Member Author

mandre commented Dec 3, 2025

/retest

@stephenfin
Copy link
Contributor

stephenfin commented Dec 4, 2025

/retest

@stephenfin
Copy link
Contributor

stephenfin commented Dec 4, 2025

/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 Dec 4, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 4, 2025

@mandre: 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 f338c9c into openshift:main Dec 4, 2025
11 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the revendor-capo branch December 4, 2025 17:12
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 4, 2025

@mandre: Jira Issue OCPBUGS-65712: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-65712 has been moved to the MODIFIED state.

Details

In response to this:

Re-vendor CAPO to get fix for deleting instances when OpenStack has a policy in place that prevents detaching the primary interface.

Switch back to upstream CAPO as it now contains all the patches we need.

go get sigs.k8s.io/[email protected]
go mod tidy
go mod vendor

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
Contributor

openshift-merge-robot commented Dec 8, 2025

Fix included in accepted release 4.21.0-0.nightly-2025-12-08-112148

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

Reviewers

@pierreprinetti pierreprinetti Awaiting requested review from pierreprinetti

@stephenfin stephenfin Awaiting requested review from stephenfin

Assignees

@stephenfin stephenfin

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mandre @openshift-ci-robot @stephenfin @openshift-merge-robot