Skip to content

chore: support reconfigure for kb 1.0 api#590

Merged
sophon-zt merged 6 commits intomainfrom
feature/improvement-support-kubeblocks-10-parameters-api
Mar 25, 2025
Merged

chore: support reconfigure for kb 1.0 api#590
sophon-zt merged 6 commits intomainfrom
feature/improvement-support-kubeblocks-10-parameters-api

Conversation

@sophon-zt
Copy link
Contributor

No description provided.

@sophon-zt sophon-zt linked an issue Mar 21, 2025 that may be closed by this pull request
@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label Mar 21, 2025
@sophon-zt sophon-zt force-pushed the feature/improvement-support-kubeblocks-10-parameters-api branch from 6880c3e to 092f5e6 Compare March 21, 2025 10:51
@sophon-zt sophon-zt force-pushed the feature/improvement-support-kubeblocks-10-parameters-api branch from 813bbae to 9fad8e5 Compare March 24, 2025 09:34
@sophon-zt sophon-zt force-pushed the feature/improvement-support-kubeblocks-10-parameters-api branch from d86292f to 1e64ef4 Compare March 24, 2025 09:55
@sophon-zt
Copy link
Contributor Author

/approve for test

@sophon-zt sophon-zt merged commit 99d1beb into main Mar 25, 2025
5 checks passed
@sophon-zt sophon-zt deleted the feature/improvement-support-kubeblocks-10-parameters-api branch March 25, 2025 01:34
@github-actions github-actions bot added this to the Release 1.0 milestone Mar 25, 2025
@sophon-zt
Copy link
Contributor Author

/cherry-pick release-1.0-beta

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Auto-merging Makefile
Auto-merging docs/user_docs/cli/cli.md
Auto-merging docs/user_docs/cli/kbcli_cluster.md
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging pkg/action/template/cluster_operations_template.cue
CONFLICT (content): Merge conflict in pkg/action/template/cluster_operations_template.cue
Auto-merging pkg/cluster/cluster.go
Auto-merging pkg/cmd/cluster/cluster.go
CONFLICT (modify/delete): pkg/cmd/cluster/config_diff.go deleted in 99d1beb (chore: support reconfigure for kb 1.0 api (#590)) and modified in HEAD. Version HEAD of pkg/cmd/cluster/config_diff.go left in tree.
Auto-merging pkg/cmd/cluster/config_edit.go
CONFLICT (content): Merge conflict in pkg/cmd/cluster/config_edit.go
Auto-merging pkg/cmd/cluster/config_observer.go
CONFLICT (content): Merge conflict in pkg/cmd/cluster/config_observer.go
Auto-merging pkg/cmd/cluster/config_ops.go
Auto-merging pkg/cmd/cluster/config_ops_test.go
Auto-merging pkg/cmd/cluster/config_resource.go
Auto-merging pkg/cmd/cluster/config_util.go
Auto-merging pkg/cmd/cluster/config_wrapper.go
Auto-merging pkg/cmd/cluster/describe_ops.go
Auto-merging pkg/cmd/cluster/errors.go
Auto-merging pkg/cmd/cluster/list_ops.go
Auto-merging pkg/cmd/cluster/logs_test.go
Auto-merging pkg/printer/describe.go
Auto-merging pkg/testing/fake.go
Auto-merging pkg/types/types.go
Auto-merging pkg/util/util.go
CONFLICT (content): Merge conflict in pkg/util/util.go
error: could not apply 99d1beb... chore: support reconfigure for kb 1.0 api (#590)
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/14050056115

@wangyelei
Copy link
Contributor

/cherry-pick release-1.0

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Auto-merging pkg/action/template/cluster_operations_template.cue
Auto-merging pkg/cluster/cluster.go
Auto-merging pkg/cmd/cluster/cluster.go
CONFLICT (modify/delete): pkg/cmd/cluster/config_diff.go deleted in 99d1beb (chore: support reconfigure for kb 1.0 api (#590)) and modified in HEAD. Version HEAD of pkg/cmd/cluster/config_diff.go left in tree.
Auto-merging pkg/cmd/cluster/config_edit.go
Auto-merging pkg/cmd/cluster/config_observer.go
Auto-merging pkg/cmd/cluster/config_ops.go
Auto-merging pkg/cmd/cluster/config_ops_test.go
Auto-merging pkg/cmd/cluster/config_resource.go
Auto-merging pkg/cmd/cluster/config_util.go
Auto-merging pkg/cmd/cluster/config_wrapper.go
Auto-merging pkg/cmd/cluster/describe_ops.go
Auto-merging pkg/cmd/cluster/errors.go
Auto-merging pkg/cmd/cluster/list_ops.go
Auto-merging pkg/cmd/cluster/logs_test.go
Auto-merging pkg/printer/describe.go
Auto-merging pkg/testing/fake.go
Auto-merging pkg/types/types.go
Auto-merging pkg/util/util.go
error: could not apply 99d1beb... chore: support reconfigure for kb 1.0 api (#590)
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/14051328328

wangyelei pushed a commit that referenced this pull request Mar 25, 2025
Co-authored-by: sophon-zt <sophon-zt@users.noreply.github.com>
(cherry picked from commit 99d1beb)
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.

[BUG] kbcli cluster describe-config error: failed to get resource [Improvement] support kubeblocks-1.0 parameters api

3 participants