Closed mergify[bot] closed 3 weeks ago
Cherry-pick of faf78376215b9c369e1acbb3db0bd43cee559837 has failed:
On branch mergify/bp/release-1.14/pr-14129
Your branch is up to date with 'origin/release-1.14'.
You are currently cherry-picking commit faf783762.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: Documentation/Helm-Charts/operator-chart.md
modified: Documentation/Storage-Configuration/Ceph-CSI/custom-images.md
modified: deploy/charts/rook-ceph/values.yaml
modified: deploy/examples/operator-openshift.yaml
modified: deploy/examples/operator.yaml
modified: pkg/operator/ceph/csi/spec.go
modified: tests/framework/utils/snapshot.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: deploy/examples/images.txt
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Below sidecars are updated with latest available versions
csi-node-driver-registrar: v2.10.1 csi-resizer: v1.10.1 csi-provisioner: v4.0.1 csi-attacher: v4.5.1 csi-snapshotter: v7.0.2
Checklist:
This is an automatic backport of pull request #14129 done by Mergify.