OCPBUGS-74586: Revendor CAPO

[mandre]

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

go get sigs.k8s.io/cluster-api-provider-openstack@release-0.9
go mod tidy
go mod vendor

[mandre]

/jira cherrypick OCPBUGS-74226

[openshift-ci-robot]

@mandre: An error was encountered cloning bug for cherrypick for bug OCPBUGS-74226 on the Jira server at https://issues.redhat.com/. No known errors were detected, please see the full error message for details.

Full error message.

request failed. Please analyze the request body for more details. Status code: 400: {"errorMessages":[],"errors":{"reporter":"The reporter specified is not a user."}}

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.
/retitle : Revendor CAPO

Details

In response to this:

/jira cherrypick OCPBUGS-74226

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]

/jira cherrypick OCPBUGS-74226

[openshift-ci-robot]

@mandre: Jira Issue OCPBUGS-74226 has been cloned as Jira Issue OCPBUGS-74586. Will retitle bug to link to clone.
/retitle OCPBUGS-74586: : Revendor CAPO

Details

In response to this:

/jira cherrypick OCPBUGS-74226

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]

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

• expected dependent Jira Issue OCPBUGS-74226 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA 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.

go get sigs.k8s.io/cluster-api-provider-openstack@release-0.9
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]

/cherry-pick release-4.18

[openshift-cherrypick-robot]

@mandre: once the present PR merges, I will cherry-pick it on top of release-4.18 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.18

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]

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

[mandre]

/jira refresh

[openshift-ci-robot]

@mandre: This pull request references Jira Issue OCPBUGS-74586, 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.19.z) matches configured target version for branch (4.19.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-74226 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-74226 targets the "4.20.z" version, which is one of the valid target versions: 4.20.0, 4.20.z
• bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (dlawton@redhat.com), skipping review request.

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.

[mandre]

/label backport-risk-assessed

[mandre]

/approve

[openshift-ci]

[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:

• OWNERS [mandre]

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

[eshulman2]

/lgtm

[mandre]

/verified later @dlaw4608

[openshift-ci-robot]

@mandre: This PR has been marked to be verified later by @dlaw4608.

Details

In response to this:

/verified later @dlaw4608

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]

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

• openshift/machine-api-provider-openstack#151

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-74586 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.

go get sigs.k8s.io/cluster-api-provider-openstack@release-0.9
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-cherrypick-robot]

@mandre: #151 failed to apply on top of branch "release-4.18":

Applying: Unignore generated files in the vendor directory
Applying: Revendor CAPO
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Removing vendor/sigs.k8s.io/cluster-api/util/topology/topology.go
Removing vendor/sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7/webhooks.go
Removing vendor/sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7/openstackmachinetemplatelist_webhook.go
Removing vendor/sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7/openstackmachinetemplate_webhook.go
Removing vendor/sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7/openstackmachinelist_webhook.go
Removing vendor/sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7/openstackmachine_webhook.go
Removing vendor/sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7/openstackclustertemplate_webhook.go
Removing vendor/sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7/openstackclusterlist_webhook.go
Removing vendor/sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7/openstackcluster_webhook.go
Auto-merging vendor/modules.txt
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 Revendor CAPO

Details

In response to this:

/cherry-pick release-4.18

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.