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

optimize force drain node and delete cluster #382

Merged

Conversation

x893675
Copy link
Collaborator

@x893675 x893675 commented Nov 14, 2022

Signed-off-by: x893675 x893675@icloud.com

What type of PR is this?

/kind optimize

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for reviewers:

Does this PR introduced a user-facing change?

None

Additional documentation, usage docs, etc.:


Signed-off-by: x893675 <x893675@icloud.com>
@kubeclipper-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: x893675

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubeclipper-bot kubeclipper-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 14, 2022
@x893675
Copy link
Collaborator Author

x893675 commented Nov 14, 2022

/cc @zhuzhenfan

@kubeclipper-bot kubeclipper-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 14, 2022
@zhuzhenfan
Copy link
Contributor

/lgtm

@kubeclipper-bot kubeclipper-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 14, 2022
@kubeclipper-bot
Copy link
Collaborator

LGTM label has been added.

Git tree hash: 7dd194ea405e420d7cfa1617673cba57ea416a1c

@kubeclipper-bot kubeclipper-bot merged commit 3318891 into kubeclipper:release-1.3 Nov 14, 2022
@x893675
Copy link
Collaborator Author

x893675 commented Nov 14, 2022

/cherrypick master

@kubeclipper-bot
Copy link
Collaborator

@x893675: #382 failed to apply on top of branch "master":

Applying: optimize force drain node and delete cluster
Using index info to reconstruct a base tree...
M	pkg/apis/core/v1/handler.go
M	pkg/apis/core/v1/utils.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/apis/core/v1/utils.go
Auto-merging pkg/apis/core/v1/handler.go
CONFLICT (content): Merge conflict in pkg/apis/core/v1/handler.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 optimize force drain node and delete cluster
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick master

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubeclipper-bot
Copy link
Collaborator

@x893675: new issue created for failed cherrypick: #384

In response to this:

/cherrypick master

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

x893675 added a commit to x893675/kubeclipper that referenced this pull request Nov 14, 2022
kubeclipper-bot pushed a commit that referenced this pull request Nov 14, 2022
Signed-off-by: x893675 <x893675@icloud.com>

Signed-off-by: x893675 <x893675@icloud.com>
@x893675 x893675 deleted the optimize-force-delete branch December 1, 2022 05:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes kind/optimize lgtm Indicates that a PR is ready to be merged. release-note-none size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants