fix test, rename cmds

Signed-off-by: Wantong Jiang <[email protected]>

Author: jwtty

test/e2e/drain_tool_test.go

@@ -359,7 +359,7 @@ var _ = Describe("Drain is allowed on one cluster, blocked on others - ClusterRe
 
 func runDrainClusterBinary(hubClusterName, memberClusterName string) {
 	By(fmt.Sprintf("draining cluster %s", memberClusterName))
-	cmd := exec.Command(fleetBinaryPath, "drain",
+	cmd := exec.Command(fleetBinaryPath, "draincluster",
 		"--hubClusterContext", hubClusterName,
 		"--clusterName", memberClusterName)
 	_, err := cmd.CombinedOutput()
@@ -368,7 +368,7 @@ func runDrainClusterBinary(hubClusterName, memberClusterName string) {
 
 func runUncordonClusterBinary(hubClusterName, memberClusterName string) {
 	By(fmt.Sprintf("uncordoning cluster %s", memberClusterName))
-	cmd := exec.Command(fleetBinaryPath, "uncordon",
+	cmd := exec.Command(fleetBinaryPath, "uncordoncluster",
 		"--hubClusterContext", hubClusterName,
 		"--clusterName", memberClusterName)
 	_, err := cmd.CombinedOutput()

test/e2e/updaterun_test.go

@@ -1093,7 +1093,7 @@ var _ = Describe("test CRP rollout with staged update run", func() {
 					return fmt.Errorf("want 1 approval request, got %d", len(appReqList.Items))
 				}
 				return nil
-			}, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to find cluster approval request")
+			}, updateRunEventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to find cluster approval request")
 		})
 
 		It("Should approve cluster approval request using kubectl-fleet approve plugin", func() {

tools/fleet/README.md

@@ -1,10 +1,11 @@
 # kubectl-fleet
 
-A unified kubectl plugin for KubeFleet cluster management operations, providing drain and uncordon functionality for member clusters in a fleet.
+A unified kubectl plugin for KubeFleet cluster management operations, providing draincluster, and uncordoncluster functionality for member clusters in a fleet,
+as well as staged update approval capability.
 
 ## Description
 
-`kubectl-fleet` allows you to manage member clusters in a KubeFleet deployment by draining workloads from clusters for maintenance and uncordoning them when ready to accept workloads again.
+`kubectl-fleet` allows you to manage member clusters in a KubeFleet deployment by approving staged updates, draining workloads from clusters for maintenance, and uncordoning them when ready to accept workloads again.
 
 ## Installation
 
@@ -63,57 +64,83 @@ CURRENT   NAME               CLUSTER            AUTHINFO
 
 Here you can see that the context of the hub cluster is called `hub` under the `NAME` column.
 
+### Approve a ClusterApprovalRequest
+
+Use the `approve` subcommand to approve ClusterApprovalRequest resources for staged update runs. This allows staged updates to proceed to the next stage by patching an "Approved" condition to the resource status.
+
+```bash
+kubectl fleet approve clusterapprovalrequest --hubClusterContext <hub-cluster-context> --name <approval-request-name>
+```
+
+Example:
+```bash
+kubectl fleet approve clusterapprovalrequest --hubClusterContext hub --name my-approval-request
+```
+
 ### Drain a Member Cluster
 
-Use the `drain` subcommand to remove all resources propagated to a member cluster from the hub cluster by any `Placement` resource. This is useful when you want to temporarily move all workloads off a member cluster in preparation for an event like upgrade or reconfiguration.
+Use the `draincluster` subcommand to remove all resources propagated to a member cluster from the hub cluster by any `Placement` resource. This is useful when you want to temporarily move all workloads off a member cluster in preparation for an event like upgrade or reconfiguration.
 
 ```bash
-kubectl fleet drain --hubClusterContext <hub-cluster-context> --clusterName <memberClusterName>
+kubectl fleet draincluster --hubClusterContext <hub-cluster-context> --clusterName <memberClusterName>
 ```
 
 Example:
 ```bash
-kubectl fleet drain --hubClusterContext hub --clusterName member-cluster-1
+kubectl fleet draincluster --hubClusterContext hub --clusterName member-cluster-1
 ```
 
 ### Uncordon a Member Cluster
 
-Use the `uncordon` subcommand to uncordon a member cluster that has been previously drained, allowing resources to be propagated to the cluster again.
+Use the `uncordoncluster` subcommand to uncordon a member cluster that has been previously drained, allowing resources to be propagated to the cluster again.
 
 ```bash
-kubectl fleet uncordon --hubClusterContext <hub-cluster-context> --clusterName <memberClusterName>
+kubectl fleet uncordoncluster --hubClusterContext <hub-cluster-context> --clusterName <memberClusterName>
 ```
 
 Example:
 ```bash
-kubectl fleet uncordon --hubClusterContext hub --clusterName member-cluster-1
+kubectl fleet uncordoncluster --hubClusterContext hub --clusterName member-cluster-1
 ```
 
 ## Subcommands
 
-### drain
+### approve
+
+Approves ClusterApprovalRequest resources for staged update runs by:
+
+1. **Status Update**: Patches the ClusterApprovalRequest resource with an "Approved" condition
+2. **Stage Progression**: Allows staged updates to proceed to the next stage automatically
+
+The approve command currently supports the following resource kinds:
+- `clusterapprovalrequest`: Approve a ClusterApprovalRequest for staged updates
+
+### draincluster
 
 Drains a member cluster by performing the following actions:
 
 1. **Cordoning**: Adds a `Taint` to the `MemberCluster` resource to prevent any new resources from being propagated to the member cluster
 2. **Eviction**: Creates `Eviction` objects for all the `Placement` objects that have propagated resources to the member cluster
 3. **Resource Removal**: Waits for all evictions to complete and resources to be removed from the member cluster
 
-**Note**: The `drain` command is a best-effort mechanism. Once the command runs successfully, you must verify that all resources propagated by `Placement` resources are removed from the member cluster. Re-running the command is safe and recommended if you notice any resources still present on the member cluster.
+**Note**: The `draincluster` command is a best-effort mechanism. Once the command runs successfully, you must verify that all resources propagated by `Placement` resources are removed from the member cluster. Re-running the command is safe and recommended if you notice any resources still present on the member cluster.
 
-### uncordon
+### uncordoncluster
 
 Uncordons a previously drained member cluster by:
 
-1. **Taint Removal**: Removes the `cordon` taint that was added to the `MemberCluster` resource by the `drain` command
+1. **Taint Removal**: Removes the `cordon` taint that was added to the `MemberCluster` resource by the `draincluster` command
 2. **Resource Propagation**: Allows resources to be propagated to the cluster again according to existing `Placement` objects
 
 If the `cordon` taint is not present on the member cluster, the command will have no effect and complete successfully.
 
 ## Flags
 
-Both `drain` and `uncordon` subcommands use the following flags:
+The `approve` subcommand uses the following flags:
+- `--hubClusterContext`: kubectl context for the hub cluster (required)
+- `--name`: name of the resource to approve (required)
 
+Both `draincluster` and `uncordoncluster` subcommands use the following flags:
 - `--hubClusterContext`: kubectl context for the hub cluster (required)
 - `--clusterName`: name of the member cluster to operate on (required)
 
@@ -126,42 +153,57 @@ Both `drain` and `uncordon` subcommands use the following flags:
 kubectl config get-contexts
 
 # 2. Drain a cluster for maintenance
-kubectl fleet drain --hubClusterContext production-hub --clusterName worker-node-1
+kubectl fleet draincluster --hubClusterContext production-hub --clusterName worker-node-1
 
 # 3. Perform maintenance on the worker-node-1 cluster
 # ... maintenance operations ...
 
 # 4. After maintenance, uncordon the cluster to allow workloads back
-kubectl fleet uncordon --hubClusterContext production-hub --clusterName worker-node-1
+kubectl fleet uncordoncluster --hubClusterContext production-hub --clusterName worker-node-1
 ```
 
 ### Additional Examples
 
 ```bash
+# Approve a ClusterApprovalRequest for staged updates
+kubectl fleet approve clusterapprovalrequest --hubClusterContext hub --name update-approval-stage-1
+
 # Drain multiple clusters (run separately for each cluster)
-kubectl fleet drain --hubClusterContext hub --clusterName east-cluster
-kubectl fleet drain --hubClusterContext hub --clusterName west-cluster
+kubectl fleet draincluster --hubClusterContext hub --clusterName east-cluster
+kubectl fleet draincluster --hubClusterContext hub --clusterName west-cluster
 
 # Uncordon clusters after maintenance
-kubectl fleet uncordon --hubClusterContext hub --clusterName east-cluster
-kubectl fleet uncordon --hubClusterContext hub --clusterName west-cluster
+kubectl fleet uncordoncluster --hubClusterContext hub --clusterName east-cluster
+kubectl fleet uncordoncluster --hubClusterContext hub --clusterName west-cluster
 ```
 
 ## Troubleshooting
 
+### Verifying Approval Operation
+
+After running the approval command, verify that the corresponding clusterApprovalRequest has been approved:
+
+1. Check that the clusterApprovalRequest has `APPROVED` set to true
+   ```
+   kubectl get clusterapprovalrequest example-run-staging
+   NAME                  UPDATE-RUN    STAGE     APPROVED   AGE
+   example-run-staging   example-run   staging   True       2m46s
+   ```
+2. Verify the updateRun is not blocked by the approval after-stage task
+
 ### Verifying Drain Operation
 
-After running the drain command, verify that resources have been removed from the member cluster:
+After running the draincluster command, verify that resources have been removed from the member cluster:
 
 1. Check that the cordon taint has been applied to the MemberCluster resource
 2. Verify that eviction objects have been created for relevant placements
 3. Confirm that workloads have been moved off the target cluster
 
-If resources remain on the cluster after draining, it's safe to re-run the drain command.
+If resources remain on the cluster after draining, it's safe to re-run the draincluster command.
 
 ### Verifying Uncordon Operation
 
-After running the uncordon command:
+After running the uncordoncluster command:
 
 1. Check that the cordon taint has been removed from the MemberCluster resource
 2. Monitor that new workloads can be scheduled to the cluster according to placement policies

tools/fleet/cmd/drain/drain.go …s/fleet/cmd/draincluster/draincluster.gotools/fleet/cmd/drain/drain.go renamed to tools/fleet/cmd/draincluster/draincluster.go tools/fleet/cmd/drain/drain.go renamed to tools/fleet/cmd/draincluster/draincluster.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package drain
+package draincluster
 
 import (
 	"context"
@@ -53,12 +53,12 @@ type drainOptions struct {
 	hubClient client.Client
 }
 
-// NewCmdDrain creates a new drain command
-func NewCmdDrain() *cobra.Command {
+// NewCmdDrainCluster creates a new draincluster command
+func NewCmdDrainCluster() *cobra.Command {
 	o := &drainOptions{}
 
 	cmd := &cobra.Command{
-		Use:   "drain",
+		Use:   "draincluster",
 		Short: "Drain a member cluster",
 		Long:  "Drain a member cluster by cordoning it and removing propagated resources",
 		RunE: func(command *cobra.Command, args []string) error {

tools/fleet/cmd/drain/drain_test.go …et/cmd/draincluster/draincluster_test.gotools/fleet/cmd/drain/drain_test.go renamed to tools/fleet/cmd/draincluster/draincluster_test.go tools/fleet/cmd/drain/drain_test.go renamed to tools/fleet/cmd/draincluster/draincluster_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package drain
+package draincluster
 
 import (
 	"context"

tools/fleet/cmd/uncordon/uncordon.go …t/cmd/uncordoncluster/uncordoncluster.gotools/fleet/cmd/uncordon/uncordon.go renamed to tools/fleet/cmd/uncordoncluster/uncordoncluster.go tools/fleet/cmd/uncordon/uncordon.go renamed to tools/fleet/cmd/uncordoncluster/uncordoncluster.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package uncordon
+package uncordoncluster
 
 import (
 	"context"
@@ -40,12 +40,12 @@ type uncordonOptions struct {
 	hubClient client.Client
 }
 
-// NewCmdUncordon creates a new uncordon command
-func NewCmdUncordon() *cobra.Command {
+// NewCmdUncordonCluster creates a new uncordoncluster command
+func NewCmdUncordonCluster() *cobra.Command {
 	o := &uncordonOptions{}
 
 	cmd := &cobra.Command{
-		Use:   "uncordon",
+		Use:   "uncordoncluster",
 		Short: "Uncordon a member cluster",
 		Long:  "Uncordon a previously drained member cluster by removing the cordon taint",
 		RunE: func(command *cobra.Command, args []string) error {

tools/fleet/cmd/uncordon/uncordon_test.go …/uncordoncluster/uncordoncluster_test.gotools/fleet/cmd/uncordon/uncordon_test.go renamed to tools/fleet/cmd/uncordoncluster/uncordoncluster_test.go tools/fleet/cmd/uncordon/uncordon_test.go renamed to tools/fleet/cmd/uncordoncluster/uncordoncluster_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package uncordon
+package uncordoncluster
 
 import (
 	"context"

tools/fleet/main.go

@@ -22,8 +22,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/kubefleet-dev/kubefleet/tools/fleet/cmd/approve"
-	"github.com/kubefleet-dev/kubefleet/tools/fleet/cmd/drain"
-	"github.com/kubefleet-dev/kubefleet/tools/fleet/cmd/uncordon"
+	"github.com/kubefleet-dev/kubefleet/tools/fleet/cmd/draincluster"
+	"github.com/kubefleet-dev/kubefleet/tools/fleet/cmd/uncordoncluster"
 )
 
 func main() {
@@ -35,8 +35,8 @@ func main() {
 
 	// Add subcommands
 	rootCmd.AddCommand(approve.NewCmdApprove())
-	rootCmd.AddCommand(drain.NewCmdDrain())
-	rootCmd.AddCommand(uncordon.NewCmdUncordon())
+	rootCmd.AddCommand(draincluster.NewCmdDrainCluster())
+	rootCmd.AddCommand(uncordoncluster.NewCmdUncordonCluster())
 
 	if err := rootCmd.Execute(); err != nil {
 		log.Fatalf("Error executing command: %v", err)