Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Sep 1, 2024

Conversation

bernerhat
Copy link
Contributor

Continuation PR for #2680

@bernerhat bernerhat force-pushed the hosted-obc branch 12 times, most recently from b53b760 to b5d4f43 Compare August 8, 2024 09:02
@bernerhat
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 8, 2024
@leelavg
Copy link
Contributor

leelavg commented Aug 9, 2024

Continuation PR for #2680

Copy link
Contributor

@leelavg leelavg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 12, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 14, 2024
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
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 Outdated Show resolved Hide resolved
services/provider/server/server.go Outdated Show resolved Hide resolved
services/provider/server/server.go Show resolved Hide resolved
@bernerhat bernerhat force-pushed the hosted-obc branch 3 times, most recently from 2f38dac to dba0f67 Compare August 22, 2024 14:06
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 28, 2024
@bernerhat bernerhat force-pushed the hosted-obc branch 2 times, most recently from 8ebd268 to 25213ed Compare August 28, 2024 13:15
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 28, 2024
@bernerhat bernerhat force-pushed the hosted-obc branch 5 times, most recently from ff6b1e6 to 47f16cb Compare August 28, 2024 15:19
Signed-off-by: Kaustav Majumder <[email protected]>
@nb-ohad
Copy link
Contributor

nb-ohad commented Sep 1, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2024
Copy link
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

Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2024
@bernerhat
Copy link
Contributor Author

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 1, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit c07a336 into red-hat-storage:main Sep 1, 2024
11 checks passed
@ezio-auditore
Copy link
Contributor

/cherry-pick release-4.17

@openshift-cherrypick-robot

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

/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
Copy link
Contributor

/cherry-pick release-4.17

@openshift-cherrypick-robot

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants