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

feat: support etcd Add-on #425

Merged
merged 7 commits into from
Nov 19, 2024
Merged

feat: support etcd Add-on #425

merged 7 commits into from
Nov 19, 2024

Conversation

loomts
Copy link
Contributor

@loomts loomts commented Aug 14, 2024

resolve #427 #426

@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines. label Aug 14, 2024
@loomts loomts changed the title Support/etcd feat: support etcd Add-on Aug 14, 2024
Makefile Outdated Show resolved Hide resolved
@ldming
Copy link
Collaborator

ldming commented Aug 14, 2024

Should be merged after apecloud/kubeblocks-addons#927 merged.

@github-actions github-actions bot added size/L Denotes a PR that changes 100-499 lines. and removed size/M Denotes a PR that changes 30-99 lines. labels Aug 14, 2024
Copy link

This PR is stale because it has been open 45 days with no activity. Remove stale label or comment

@github-actions github-actions bot added the Stale label Sep 30, 2024
@github-actions github-actions bot added size/XXL Denotes a PR that changes 1000+ lines. and removed size/L Denotes a PR that changes 100-499 lines. labels Nov 15, 2024
@github-actions github-actions bot removed the Stale label Nov 18, 2024
@loomts loomts merged commit c0c5768 into apecloud:main Nov 19, 2024
6 checks passed
@github-actions github-actions bot added this to the Release 1.0 milestone Nov 19, 2024
@wangyelei
Copy link
Contributor

/cherry-pick release-1.0

Copy link

🤖 says: Error cherry-picking.

Failed to merge submodule addons (not checked out)
CONFLICT (submodule): Merge conflict in addons
warning: Cannot merge binary files: pkg/cluster/charts/elasticsearch.tgz (HEAD vs. c0c5768 (feat: support etcd Add-on (#425)))
Auto-merging pkg/cluster/charts/elasticsearch.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/elasticsearch.tgz
warning: Cannot merge binary files: pkg/cluster/charts/kafka.tgz (HEAD vs. c0c5768 (feat: support etcd Add-on (#425)))
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. c0c5768 (feat: support etcd Add-on (#425)))
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/postgresql.tgz (HEAD vs. c0c5768 (feat: support etcd Add-on (#425)))
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. c0c5768 (feat: support etcd Add-on (#425)))hint: Recursive merging with submodules currently only supports trivial cases.
hint: Please manually handle the merging of each conflicted submodule.
hint: This can be accomplished with the following steps:
hint: - come back to superproject and run:
hint:
hint: git add addons
hint:
hint: to record the above merge or update
hint: - resolve any other conflicts in the superproject
hint: - commit the resulting index in the superproject
hint:
hint: Disable this message with "git config advice.submoduleMergeConflict false"

Auto-merging pkg/cluster/charts/qdrant.tgz
CONFLICT (content): Merge conflict in pkg/cluster/charts/qdrant.tgz
error: could not apply c0c5768... feat: support etcd Add-on (#425)
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"

Copy link

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

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.

[Features] add etcd
4 participants