kubernetes-csi-addons
kubernetes-csi-addons copied to clipboard
adding vg api
@mergifyio rebase
rebase
❌ Base branch update has failed
Git reported the following error:
Rebasing (1/1)
Auto-merging config/crd/bases/csiaddons.openshift.io_reclaimspacecronjobs.yaml
Auto-merging deploy/controller/crds.yaml
CONFLICT (content): Merge conflict in deploy/controller/crds.yaml
Auto-merging deploy/controller/install-all-in-one.yaml
CONFLICT (content): Merge conflict in deploy/controller/install-all-in-one.yaml
Auto-merging go.mod
Auto-merging go.sum
Auto-merging vendor/modules.txt
error: could not apply b808ddeb... adding vg api
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b808ddeb... adding vg api
err-code: 35C31
This is too complex to include, #588 is a simpler API that lets CSI-drivers handle the grouping of volumes how they like.