search

apecloud / kubeblocks

KubeBlocks is an open-source control plane software that runs and manages databases, message queues and other stateful applications on K8s.
https://kubeblocks.io
GNU Affero General Public License v3.0
1.75k stars 154 forks source link

chore: backupSchedule controller watches the continuous backup #7660

Closed wangyelei closed 5 days ago

wangyelei commented 5 days ago

/cherry-pick release-0.9

github-actions[bot] commented 5 days ago

🤖 says: cherry pick action finished successfully 🎉!
See: https://github.com/apecloud/kubeblocks/actions/runs/9706243499

wangyelei commented 5 days ago

/cherry-pick release-0.8

github-actions[bot] commented 5 days ago

🤖 says: Error cherry-picking.

Auto-merging controllers/dataprotection/backupschedule_controller.go CONFLICT (content): Merge conflict in controllers/dataprotection/backupschedule_controller.go error: could not apply f925c65c9... chore: backupSchedule controller watches the continuous backup (#7660) hint: After resolving the conflicts, mark them with hint: "git add/rm ", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort". hint: Disable this message with "git config advice.mergeConflict false"

github-actions[bot] commented 5 days ago

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks/actions/runs/9709278856