search

red-hat-storage / ocs-operator

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

saving quota in GiB instead GB #2895

Closed rchikatw closed 1 week ago

rchikatw commented 2 weeks ago
rchikatw commented 2 weeks ago

@nb-ohad @leelavg please review

leelavg commented 1 week ago

/lgtm

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: leelavg, nb-ohad, rchikatw

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
rchikatw commented 1 week ago

/cherry-pick release-4.17

openshift-cherrypick-robot commented 1 week ago

@rchikatw: #2895 failed to apply on top of branch "release-4.17":

Applying: server: saving quota in GiB instead GB
Using index info to reconstruct a base tree...
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
Auto-merging services/provider/server/server.go
CONFLICT (content): Merge conflict in services/provider/server/server.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 server: saving quota in GiB instead GB
In response to [this](https://github.com/red-hat-storage/ocs-operator/pull/2895#issuecomment-2485313469): >/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.