Add flag --force to implement force deletion#7085
Add flag --force to implement force deletion#7085FAUST-BENCHOU wants to merge 1 commit intokarmada-io:masterfrom
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Summary of ChangesHello @FAUST-BENCHOU, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request addresses a previously identified need by implementing a Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request correctly implements the --force flag for the unregister command, enabling force deletion of clusters. The implementation is straightforward and passes the flag to the underlying deletion logic. However, since this introduces a new CLI flag, it is a user-facing change and should have a release note. I've also included a minor suggestion to improve the command's example usage for better clarity and consistency.
| %[1]s unregister CLUSTER_NAME --karmada-config=<KARMADA_CONFIG> [--karmada-context=<KARMADA_CONTEXT>] --cluster-kubeconfig=<CLUSTER_KUBECONFIG> [--cluster-context=<CLUSTER_CONTEXT>] | ||
|
|
||
| # Force unregister cluster from karmada control plane | ||
| %[1]s unregister CLUSTER_NAME --cluster-kubeconfig=<CLUSTER_KUBECONFIG> --force |
There was a problem hiding this comment.
The new example for the --force flag is good, but it could be more comprehensive. To improve consistency with other examples and better illustrate its usage, consider including optional flags like [--cluster-context=<CLUSTER_CONTEXT>]. This shows users that --force can be combined with other existing options.
| %[1]s unregister CLUSTER_NAME --cluster-kubeconfig=<CLUSTER_KUBECONFIG> --force | |
| %[1]s unregister CLUSTER_NAME --cluster-kubeconfig=<CLUSTER_KUBECONFIG> [--cluster-context=<CLUSTER_CONTEXT>] --force |
|
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #7085 +/- ##
=======================================
Coverage 42.03% 42.04%
=======================================
Files 874 874
Lines 53454 53455 +1
=======================================
+ Hits 22471 22474 +3
+ Misses 29294 29293 -1
+ Partials 1689 1688 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
XiShanYongYe-Chang
left a comment
There was a problem hiding this comment.
Thanks @FAUST-BENCHOU
| flags.StringVar(&j.ClusterNamespace, "cluster-namespace", options.DefaultKarmadaClusterNamespace, "Namespace in the control plane where member cluster secrets are stored.") | ||
| flags.DurationVar(&j.Wait, "wait", 60*time.Second, "wait for the unjoin command execution process(default 60s), if there is no success after this time, timeout will be returned.") | ||
| flags.BoolVar(&j.DryRun, "dry-run", false, "Run the command in dry-run mode, without making any server requests.") | ||
| flags.BoolVar(&j.Force, "force", false, "When set, the unregister command will attempt to force delete the cluster object by removing finalizers if the normal deletion times out. This may leave some resources in the member cluster.") |
There was a problem hiding this comment.
Is the meaning of this parameter the same as that of the force parameter in the unjoin command, except for the difference in subcommands? If they are the same, the parameter description can be directly reused.
| %[1]s unregister CLUSTER_NAME --karmada-config=<KARMADA_CONFIG> [--karmada-context=<KARMADA_CONTEXT>] --cluster-kubeconfig=<CLUSTER_KUBECONFIG> [--cluster-context=<CLUSTER_CONTEXT>] | ||
|
|
||
| # Force unregister cluster from karmada control plane | ||
| %[1]s unregister CLUSTER_NAME --cluster-kubeconfig=<CLUSTER_KUBECONFIG> --force |
Signed-off-by: zhoujinyu <2319109590@qq.com>
f80f348 to
e308b62
Compare
There was a problem hiding this comment.
Pull request overview
Adds a --force option to karmadactl unregister to support forced deletion behavior when unregistering pull-mode clusters.
Changes:
- Extend
unregisterCLI examples to document--forceusage. - Add
Forceoption toCommandUnregisterOptionand expose it as a--forceflag. - Wire
--forceintocmdutil.DeleteClusterObject(...)during cluster deletion.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| flags.StringVar(&j.ClusterNamespace, "cluster-namespace", options.DefaultKarmadaClusterNamespace, "Namespace in the control plane where member cluster secrets are stored.") | ||
| flags.DurationVar(&j.Wait, "wait", 60*time.Second, "wait for the unjoin command execution process(default 60s), if there is no success after this time, timeout will be returned.") | ||
| flags.BoolVar(&j.DryRun, "dry-run", false, "Run the command in dry-run mode, without making any server requests.") | ||
| flags.BoolVar(&j.Force, "force", false, "When set, the unregister command will attempt to clean up resources in the member cluster before deleting the Cluster object. If the cleanup fails within the timeout period, the Cluster object will still be deleted, potentially leaving some resources behind in the member cluster.") |
There was a problem hiding this comment.
The --force flag help text doesn’t match what the code does. In this command, the Cluster is deleted first, and cmdutil.DeleteClusterObject(..., force) only triggers forced deletion by removing finalizers if the Cluster isn’t deleted within --wait; it does not “clean up resources in the member cluster before deleting the Cluster object”. Please reword the flag description (and/or adjust the implementation) so the user-facing behavior is accurately described, and clarify what parts are best-effort in force mode.
| flags.BoolVar(&j.Force, "force", false, "When set, the unregister command will attempt to clean up resources in the member cluster before deleting the Cluster object. If the cleanup fails within the timeout period, the Cluster object will still be deleted, potentially leaving some resources behind in the member cluster.") | |
| flags.BoolVar(&j.Force, "force", false, "When set, if the Cluster object is not deleted successfully within the --wait duration, the command will attempt a forced deletion by removing finalizers from the Cluster. This is a best-effort operation and may leave some resources behind in the member cluster.") |
| flags.StringVar(&j.ClusterNamespace, "cluster-namespace", options.DefaultKarmadaClusterNamespace, "Namespace in the control plane where member cluster secrets are stored.") | ||
| flags.DurationVar(&j.Wait, "wait", 60*time.Second, "wait for the unjoin command execution process(default 60s), if there is no success after this time, timeout will be returned.") | ||
| flags.BoolVar(&j.DryRun, "dry-run", false, "Run the command in dry-run mode, without making any server requests.") | ||
| flags.BoolVar(&j.Force, "force", false, "When set, the unregister command will attempt to clean up resources in the member cluster before deleting the Cluster object. If the cleanup fails within the timeout period, the Cluster object will still be deleted, potentially leaving some resources behind in the member cluster.") |
There was a problem hiding this comment.
With --force, this command still returns an error if cleanupMemberClusterResources() fails (it is unconditional later in RunUnregisterCluster). That conflicts with the current flag description’s promise that the Cluster object “will still be deleted” even if cleanup fails. Either make member-cluster cleanup best-effort when --force is set (similar to unjoin’s force behavior), or adjust the flag text to avoid implying cleanup failures won’t fail the command.
| flags.BoolVar(&j.Force, "force", false, "When set, the unregister command will attempt to clean up resources in the member cluster before deleting the Cluster object. If the cleanup fails within the timeout period, the Cluster object will still be deleted, potentially leaving some resources behind in the member cluster.") | |
| flags.BoolVar(&j.Force, "force", false, "When set, the unregister command will attempt to clean up resources in the member cluster before deleting the Cluster object. Cleanup and deletion are performed on a best-effort basis and may still fail, potentially leaving resources behind in the member cluster or the Cluster object in the control plane.") |
| flags.StringVar(&j.ClusterNamespace, "cluster-namespace", options.DefaultKarmadaClusterNamespace, "Namespace in the control plane where member cluster secrets are stored.") | ||
| flags.DurationVar(&j.Wait, "wait", 60*time.Second, "wait for the unjoin command execution process(default 60s), if there is no success after this time, timeout will be returned.") | ||
| flags.BoolVar(&j.DryRun, "dry-run", false, "Run the command in dry-run mode, without making any server requests.") | ||
| flags.BoolVar(&j.Force, "force", false, "When set, the unregister command will attempt to clean up resources in the member cluster before deleting the Cluster object. If the cleanup fails within the timeout period, the Cluster object will still be deleted, potentially leaving some resources behind in the member cluster.") |
There was a problem hiding this comment.
This PR introduces a new user-facing CLI flag (--force) but the PR description’s release-note block is NONE. Please add an appropriate release note entry describing the new flag/behavior so users learn about it from the changelog process.
| // 2. delete the cluster object from the Karmada control plane | ||
| //TODO: add flag --force to implement force deletion. | ||
| if err = cmdutil.DeleteClusterObject(j.ControlPlaneKubeClient, j.ControlPlaneClient, j.ClusterName, j.Wait, j.DryRun, false); err != nil { | ||
| if err = cmdutil.DeleteClusterObject(j.ControlPlaneKubeClient, j.ControlPlaneClient, j.ClusterName, j.Wait, j.DryRun, j.Force); err != nil { |
There was a problem hiding this comment.
There are existing unit tests for unregister (see unregister_test.go), but none cover the new --force path. Please add a test that sets Force=true and verifies the flag is wired through to cmdutil.DeleteClusterObject, ideally simulating a deletion timeout (e.g., via a fake client reactor) to exercise the forced-finalizer-removal behavior.
|
@XiShanYongYe-Chang Thanks for review!updated. |
What type of PR is this?
What this PR does / why we need it:
need of "TODO:add flag --force to implement force deletion"
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?: