search

red-hat-storage / ocs-operator

Operator for RHOCS
Apache License 2.0
86 stars 184 forks source link

Added support for ocs provider server to fetch noobaa client resources #2733

Closed bernerhat closed 1 week ago

bernerhat commented 1 month ago

Continuation PR for #2680

bernerhat commented 1 month ago

/hold

leelavg commented 1 month ago

Continuation PR for #2680

  • should #2680 be also in for this PR?
nb-ohad commented 1 week ago

/lgtm

openshift-ci[bot] commented 1 week ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bernerhat, nb-ohad

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/red-hat-storage/ocs-operator/blob/main/OWNERS)~~ [nb-ohad] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
bernerhat commented 1 week ago

/unhold

ezio-auditore commented 1 week ago

/cherry-pick release-4.17

openshift-cherrypick-robot commented 1 week ago

@ezio-auditore: #2733 failed to apply on top of branch "release-4.17":

Applying: added support for ocs provider server to fetch noobaa resources
Using index info to reconstruct a base tree...
M   services/provider/server/consumer_test.go
M   services/provider/server/server.go
M   services/provider/server/server_test.go
Falling back to patching base and 3-way merge...
Auto-merging services/provider/server/server_test.go
CONFLICT (content): Merge conflict in services/provider/server/server_test.go
Auto-merging services/provider/server/server.go
Auto-merging services/provider/server/consumer_test.go
CONFLICT (content): Merge conflict in services/provider/server/consumer_test.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 added support for ocs provider server to fetch noobaa resources
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/red-hat-storage/ocs-operator/pull/2733#issuecomment-2326648466): >/cherry-pick release-4.17 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.