Skip to content

Conversation

@leelavg
Copy link
Contributor

@leelavg leelavg commented Dec 2, 2025

No description provided.

@leelavg
Copy link
Contributor Author

leelavg commented Dec 2, 2025

/cherrypick release-4.20
via DFBUGS-4779

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 2, 2025

@leelavg: once the present PR merges, I will cherry-pick it on top of release-4.20 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.20
via DFBUGS-4779

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.

@Madhu-1
Copy link
Member

Madhu-1 commented Dec 8, 2025

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Dec 8, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: leelavg, Madhu-1

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:

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

@openshift-merge-bot openshift-merge-bot bot merged commit 742163f into red-hat-storage:main Dec 8, 2025
12 checks passed
@openshift-cherrypick-robot

@leelavg: #502 failed to apply on top of branch "release-4.20":

Applying: bundle: label csv with arm64 tag to show up in operatorhub ui
Using index info to reconstruct a base tree...
M	bundle/manifests/ocs-client-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging bundle/manifests/ocs-client-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/ocs-client-operator.clusterserviceversion.yaml
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 bundle: label csv with arm64 tag to show up in operatorhub ui

Details

In response to this:

/cherrypick release-4.20
via DFBUGS-4779

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants