Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update addons lists and subcommand docs #558

Merged
merged 1 commit into from
Feb 13, 2025

Conversation

shanshanying
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label Feb 12, 2025
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 41.22%. Comparing base (5db20f8) to head (215944f).

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #558      +/-   ##
==========================================
- Coverage   41.24%   41.22%   -0.03%     
==========================================
  Files         187      187              
  Lines       25225    25213      -12     
==========================================
- Hits        10404    10394      -10     
+ Misses      13642    13640       -2     
  Partials     1179     1179              
Flag Coverage Δ
unittests 41.22% <100.00%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@shanshanying shanshanying merged commit d8c452e into main Feb 13, 2025
12 checks passed
@shanshanying shanshanying deleted the support/update-embed-charts-and-docs branch February 13, 2025 01:51
@shanshanying
Copy link
Contributor Author

/cherry-pick release-1.0

@github-actions github-actions bot added this to the Release 1.0 milestone Feb 13, 2025
@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

CONFLICT (rename/delete): docs/user_docs/cli/kbcli_cluster_custom-ops_etcd-defragmentation.md renamed to docs/user_docs/cli/kbcli_addon_delete-resources-with-version.md in d8c452e (chore: update addons lists and subcommand docs (#558)), but deleted in HEAD.
CONFLICT (modify/delete): docs/user_docs/cli/kbcli_addon_delete-resources-with-version.md deleted in HEAD and modified in d8c452e (chore: update addons lists and subcommand docs (#558)). Version d8c452e (chore: update addons lists and subcommand docs (#558)) of docs/user_docs/cli/kbcli_addon_delete-resources-with-version.md left in tree.
Auto-merging docs/user_docs/cli/kbcli_cluster_create_minio.md
CONFLICT (content): Merge conflict in docs/user_docs/cli/kbcli_cluster_create_minio.md
Auto-merging pkg/cluster/builtin_charts.go
warning: Cannot merge binary files: pkg/cluster/charts/apecloud-mysql.tgz (HEAD vs. d8c452e (chore: update addons lists and subcommand docs (#558)))
Auto-merging pkg/cluster/charts/apecloud-mysql.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/apecloud-mysql.tgz
warning: Cannot merge binary files: pkg/cluster/charts/etcd.tgz (HEAD vs. d8c452e (chore: update addons lists and subcommand docs (#558)))
Auto-merging pkg/cluster/charts/etcd.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/etcd.tgz
warning: Cannot merge binary files: pkg/cluster/charts/kafka.tgz (HEAD vs. d8c452e (chore: update addons lists and subcommand docs (#558)))
Auto-merging pkg/cluster/charts/kafka.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/kafka.tgz
warning: Cannot merge binary files: pkg/cluster/charts/mongodb.tgz (HEAD vs. d8c452e (chore: update addons lists and subcommand docs (#558)))
Auto-merging pkg/cluster/charts/mongodb.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/mongodb.tgz
warning: Cannot merge binary files: pkg/cluster/charts/mysql.tgz (HEAD vs. d8c452e (chore: update addons lists and subcommand docs (#558)))
Auto-merging pkg/cluster/charts/mysql.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/mysql.tgz
warning: Cannot merge binary files: pkg/cluster/charts/postgresql.tgz (HEAD vs. d8c452e (chore: update addons lists and subcommand docs (#558)))
Auto-merging pkg/cluster/charts/postgresql.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/postgresql.tgz
warning: Cannot merge binary files: pkg/cluster/charts/qdrant.tgz (HEAD vs. d8c452e (chore: update addons lists and subcommand docs (#558)))
Auto-merging pkg/cluster/charts/qdrant.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/qdrant.tgz
warning: Cannot merge binary files: pkg/cluster/charts/redis.tgz (HEAD vs. d8c452e (chore: update addons lists and subcommand docs (#558)))
Auto-merging pkg/cluster/charts/redis.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/redis.tgz
error: could not apply d8c452e... chore: update addons lists and subcommand docs (#558)
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"

@apecloud-bot
Copy link
Collaborator

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

@shanshanying
Copy link
Contributor Author

mannually submmited: #560

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XXL Denotes a PR that changes 1000+ lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants