Skip to content

fix: ck ops commands#2477

Merged
loomts merged 2 commits intomainfrom
fix/ops-commands
Mar 5, 2026
Merged

fix: ck ops commands#2477
loomts merged 2 commits intomainfrom
fix/ops-commands

Conversation

@loomts
Copy link
Contributor

@loomts loomts commented Mar 5, 2026

@loomts loomts requested review from a team as code owners March 5, 2026 04:28
@loomts loomts changed the title fix: ops commands fix: ck ops commands Mar 5, 2026
@loomts loomts added pick-1.1 Auto cherry-pick to release-1.1 when PR merged pick-1.0 Auto cherry-pick to release-1.0 when PR merged pick-0.9 Auto cherry-pick to release-0.9 when PR merged labels Mar 5, 2026
@loomts
Copy link
Contributor Author

loomts commented Mar 5, 2026

/approve

@loomts loomts merged commit 5efcfc5 into main Mar 5, 2026
20 checks passed
@loomts loomts deleted the fix/ops-commands branch March 5, 2026 06:05
@apecloud-bot
Copy link
Collaborator

apecloud-bot commented Mar 5, 2026

/cherry-pick release-1.0

@apecloud-bot
Copy link
Collaborator

apecloud-bot commented Mar 5, 2026

/cherry-pick release-0.9

@apecloud-bot
Copy link
Collaborator

apecloud-bot commented Mar 5, 2026

/cherry-pick release-1.1

@apecloud-bot
Copy link
Collaborator

apecloud-bot commented Mar 5, 2026

🤖 says: Error cherry-picking.

CONFLICT (modify/delete): addons/clickhouse/README.md deleted in HEAD and modified in 5efcfc5 (fix: ck ops commands (#2477)). Version 5efcfc5 (fix: ck ops commands (#2477)) of addons/clickhouse/README.md left in tree.
Auto-merging addons/clickhouse/scripts/post-for-rebuild.sh
Auto-merging addons/clickhouse/scripts/post-for-scale-out-shard.sh
Auto-merging addons/clickhouse/templates/opsdefinition.yaml
error: could not apply 5efcfc5... fix: ck ops commands (#2477)
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 set advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

apecloud-bot commented Mar 5, 2026

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

apecloud-bot pushed a commit that referenced this pull request Mar 5, 2026
@loomts @apecloud-bot
fix: ck ops commands (#2477)
19e4d64 
Co-authored-by: loomts <loomts@users.noreply.github.com>
(cherry picked from commit 5efcfc5)
@apecloud-bot
Copy link
Collaborator

apecloud-bot commented Mar 5, 2026

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

@apecloud-bot
Copy link
Collaborator

apecloud-bot commented Mar 5, 2026

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

apecloud-bot pushed a commit that referenced this pull request Mar 5, 2026
@loomts @apecloud-bot
fix: ck ops commands (#2477)
e379e9a 
Co-authored-by: loomts <loomts@users.noreply.github.com>
(cherry picked from commit 5efcfc5)
loomts added a commit that referenced this pull request Mar 5, 2026
@loomts
fix: ck ops commands (#2477)
778d440
loomts added a commit that referenced this pull request Mar 5, 2026
@loomts
fix: ck ops commands (#2477) (#2478)
d892000
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wangyelei wangyelei wangyelei approved these changes

@apecloud-bot apecloud-bot apecloud-bot approved these changes

Assignees

No one assigned

Labels

pick-0.9 Auto cherry-pick to release-0.9 when PR merged pick-1.0 Auto cherry-pick to release-1.0 when PR merged pick-1.1 Auto cherry-pick to release-1.1 when PR merged

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@loomts @apecloud-bot @wangyelei