search

openstack-k8s-operators / openstack-operator

Meta Operator for OpenStack
https://openstack-k8s-operators.github.io/openstack-operator/
Apache License 2.0
27 stars 76 forks source link

Fix duplicateNode check #868

Closed rabi closed 3 months ago

rabi commented 3 months ago
rabi commented 3 months ago

/retest

rabi commented 3 months ago

/retest

openshift-ci[bot] commented 3 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bshephar, rabi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openstack-k8s-operators/openstack-operator/blob/main/OWNERS)~~ [bshephar,rabi] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
rabi commented 1 month ago

/cherry-pick 18.0.0-proposed

openshift-cherrypick-robot commented 1 month ago

@rabi: #868 failed to apply on top of branch "18.0.0-proposed":

Applying: Fix duplicateNode check
Using index info to reconstruct a base tree...
M   apis/dataplane/v1beta1/openstackdataplanenodeset_types.go
M   apis/dataplane/v1beta1/openstackdataplanenodeset_webhook.go
Falling back to patching base and 3-way merge...
Auto-merging apis/dataplane/v1beta1/openstackdataplanenodeset_webhook.go
CONFLICT (content): Merge conflict in apis/dataplane/v1beta1/openstackdataplanenodeset_webhook.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix duplicateNode check
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openstack-k8s-operators/openstack-operator/pull/868#issuecomment-2304256049): >/cherry-pick 18.0.0-proposed Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.