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 panic if no annotation is provided for rabbitmq LoadBalancer override #932

Closed stuggi closed 2 months ago

stuggi commented 2 months ago

Jira: https://issues.redhat.com/browse/OSPRH-8066

openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, stuggi

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)~~ [abays,stuggi] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
stuggi commented 3 weeks ago

/cherry-pick 18.0.0-proposed

openshift-cherrypick-robot commented 3 weeks ago

@stuggi: #932 failed to apply on top of branch "18.0.0-proposed":

Applying: Fix panic if no annotation is provided for rabbitmq LoadBalancer override
Using index info to reconstruct a base tree...
M   config/manifests/bases/openstack-operator.clusterserviceversion.yaml
M   pkg/openstack/rabbitmq.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/openstack/rabbitmq.go
Auto-merging config/manifests/bases/openstack-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in config/manifests/bases/openstack-operator.clusterserviceversion.yaml
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 panic if no annotation is provided for rabbitmq LoadBalancer override
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/932#issuecomment-2326635301): >/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.