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

Merged

openshift-merge-bot[bot] merged 2 commits intored-hat-storage:mainfrom

bernerhat:hosted-obc

Sep 1, 2024

Contributor

bernerhat commented Aug 7, 2024

Continuation PR for #2680

bernerhat force-pushed the hosted-obc branch 12 times, most recently from b53b760 to b5d4f43 Compare

August 8, 2024 09:02

Contributor Author

bernerhat commented Aug 8, 2024

/hold

openshift-ci bot added the do-not-merge/hold label

Contributor

leelavg commented Aug 9, 2024

Continuation PR for #2680

should Added support for ocs provider server to fetch noobaa client resources #2680 be also in for this PR?

leelavg reviewed

View reviewed changes

Contributor

leelavg left a comment

after seeing the pattern I believe it might be good to have this in storageconsumer controller and may I know what is the diff b/n this & the referred PR?

services/provider/server/consumer.go Outdated Show resolved Hide resolved

services/provider/server/server.go Outdated Show resolved Hide resolved

services/provider/server/consumer.go Outdated Show resolved Hide resolved

services/provider/server/server.go Outdated Show resolved Hide resolved

services/provider/server/server.go Outdated Show resolved Hide resolved

services/provider/server/server_test.go Outdated Show resolved Hide resolved

leelavg mentioned this pull request

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

Closed

openshift-merge-robot added the needs-rebase label

bernerhat force-pushed the hosted-obc branch from b5d4f43 to 09129e6 Compare

August 14, 2024 09:55

openshift-merge-robot removed the needs-rebase label

leelavg reviewed

View reviewed changes

controllers/storageconsumer/storageconsumer_controller.go Outdated Show resolved Hide resolved

controllers/storageconsumer/storageconsumer_controller.go Outdated Show resolved Hide resolved

services/provider/server/server.go Show resolved Hide resolved

services/provider/server/server.go Show resolved Hide resolved

services/provider/server/server_test.go Show resolved Hide resolved

services/provider/server/server.go Outdated Show resolved Hide resolved

rbac/provider-role.yaml Outdated Show resolved Hide resolved

nb-ohad requested changes

View reviewed changes

controllers/storageconsumer/storageconsumer_controller.go Outdated Show resolved Hide resolved

controllers/storageconsumer/storageconsumer_controller.go Outdated Show resolved Hide resolved

controllers/storageconsumer/storageconsumer_controller.go Outdated Show resolved Hide resolved

controllers/storageconsumer/storageconsumer_controller.go Outdated Show resolved Hide resolved

controllers/storageconsumer/storageconsumer_controller.go Outdated Show resolved Hide resolved

services/provider/server/server.go Show resolved Hide resolved

services/provider/server/server.go Show resolved Hide resolved

services/provider/server/server.go Show resolved Hide resolved

openshift-ci bot assigned nb-ohad

bernerhat force-pushed the hosted-obc branch 3 times, most recently from 2f38dac to dba0f67 Compare

August 22, 2024 14:06

openshift-merge-robot added the needs-rebase label

bernerhat force-pushed the hosted-obc branch 2 times, most recently from 8ebd268 to 25213ed Compare

August 28, 2024 13:15

openshift-merge-robot removed the needs-rebase label

bernerhat force-pushed the hosted-obc branch 5 times, most recently from ff6b1e6 to 47f16cb Compare

August 28, 2024 15:19


          added support for ocs provider server to fetch noobaa resources

943f378

Signed-off-by: Kaustav Majumder <kaustav.majumder@ibm.com>

bernerhat force-pushed the hosted-obc branch from 47f16cb to f3f16a2 Compare

August 29, 2024 10:54


          generated changes

da969b8

Signed-off-by: Kaustav Majumder <kaustav.majumder@ibm.com>

bernerhat force-pushed the hosted-obc branch from f3f16a2 to da969b8 Compare

September 1, 2024 07:53

Contributor

nb-ohad commented Sep 1, 2024

/lgtm

openshift-ci bot added the lgtm label

Contributor

openshift-ci bot commented Sep 1, 2024

[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

Details

Needs approval from an approver in each of these files:

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

openshift-ci bot added the approved label

Contributor Author

bernerhat commented Sep 1, 2024

/unhold

openshift-ci bot removed the do-not-merge/hold label

openshift-merge-bot bot merged commit c07a336 into red-hat-storage:main

Contributor

ezio-auditore commented Sep 3, 2024

/cherry-pick release-4.17

openshift-cherrypick-robot commented Sep 3, 2024

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

Details

In response to this:

/cherry-pick release-4.17

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.

ezio-auditore mentioned this pull request

Bug 2309488:[release-4.17] Added support for ocs provider server to fetch noobaa client resources #2783

Closed

Contributor

ezio-auditore commented Sep 17, 2024

/cherry-pick release-4.17

openshift-cherrypick-robot commented Sep 17, 2024

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

Details

In response to this:

/cherry-pick release-4.17

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.

ezio-auditore mentioned this pull request

Bug 2309488:[release-4.17] Added support for ocs provider server to fetch noobaa client resources #2800

Merged

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

Labels