fix: remove clusterset add, add clusterset set (#153)

Signed-off-by: ycyaoxdu <[email protected]>
open-cluster-management-io · Mar 15, 2022 · a22434d · a22434d
1 parent 1a74a74
commit a22434d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/pkg/cmd/clusterset/cmd.go b/pkg/cmd/clusterset/cmd.go
@@ -4,8 +4,8 @@ package clusterset
 import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
-	"open-cluster-management.io/clusteradm/pkg/cmd/clusterset/add"
 	"open-cluster-management.io/clusteradm/pkg/cmd/clusterset/bind"
+	"open-cluster-management.io/clusteradm/pkg/cmd/clusterset/set"
 	"open-cluster-management.io/clusteradm/pkg/cmd/clusterset/unbind"
 	genericclioptionsclusteradm "open-cluster-management.io/clusteradm/pkg/genericclioptions"
 )
@@ -17,7 +17,7 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 		Short: "clusterset sub-command",
 	}
 
-	cmd.AddCommand(add.NewCmd(clusteradmFlags, streams))
+	cmd.AddCommand(set.NewCmd(clusteradmFlags, streams))
 	cmd.AddCommand(bind.NewCmd(clusteradmFlags, streams))
 	cmd.AddCommand(unbind.NewCmd(clusteradmFlags, streams))
 

diff --git a/pkg/cmd/clusterset/add/cmd.go → pkg/cmd/clusterset/set/cmd.go b/pkg/cmd/clusterset/add/cmd.go → pkg/cmd/clusterset/set/cmd.go
@@ -1,5 +1,5 @@
 // Copyright Contributors to the Open Cluster Management project
-package add
+package set
 
 import (
 	"fmt"
@@ -12,17 +12,17 @@ import (
 )
 
 var example = `
-# add clusters to a clusterset.
-%[1]s clusterset add clusterset1 --clusters cluster1,cluster2
+# set clusters to a clusterset.
+%[1]s clusterset set clusterset1 --clusters cluster1,cluster2
 `
 
 // NewCmd...
 func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, streams genericclioptions.IOStreams) *cobra.Command {
 	o := newOptions(clusteradmFlags, streams)
 
 	cmd := &cobra.Command{
-		Use:          "add",
-		Short:        "add clusters to a clusterset",
+		Use:          "set",
+		Short:        "set clusters to a clusterset",
 		Example:      fmt.Sprintf(example, clusteradmhelpers.GetExampleHeader()),
 		SilenceUsage: true,
 		PreRunE: func(c *cobra.Command, args []string) error {
@@ -45,8 +45,7 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 		},
 	}
 
-	cmd.Flags().StringSliceVar(&o.Clusters, "clusters", []string{}, "Names of the managed cluster to add to the clusterset (comma separated)")
-	cmd.Flags().BoolVar(&o.replace, "replace", false, "directly add cluster in clusterset1 to clusterset2 if --replace is set")
+	cmd.Flags().StringSliceVar(&o.Clusters, "clusters", []string{}, "Names of the managed cluster to set to the clusterset (comma separated)")
 
 	return cmd
 }
diff --git a/pkg/cmd/clusterset/add/exec.go → pkg/cmd/clusterset/set/exec.go b/pkg/cmd/clusterset/add/exec.go → pkg/cmd/clusterset/set/exec.go
@@ -1,5 +1,5 @@
 // Copyright Contributors to the Open Cluster Management project
-package add
+package set
 
 import (
 	"context"
@@ -53,11 +53,7 @@ func (o *Options) run() (err error) {
 
 		clusterset := cluster.Labels["cluster.open-cluster-management.io/clusterset"]
 		if clusterset == o.Clusterset {
-			fmt.Fprintf(o.Streams.Out, "Cluster %s is already added into Clusterset %s\n", clusterName, o.Clusterset)
-			continue
-		}
-		if !o.replace {
-			fmt.Fprintf(o.Streams.Out, "Cluster %s is already added into Clusterset %s, you can't add it to %s\n", clusterName, clusterset, o.Clusterset)
+			fmt.Fprintf(o.Streams.Out, "Cluster %s is already in Clusterset %s\n", clusterName, o.Clusterset)
 			continue
 		}
 
@@ -67,7 +63,7 @@ func (o *Options) run() (err error) {
 			return err
 		}
 
-		fmt.Fprintf(o.Streams.Out, "Cluster %s is added into Clusterset %s\n", clusterName, o.Clusterset)
+		fmt.Fprintf(o.Streams.Out, "Cluster %s is set, from ClusterSet %s to Clusterset %s\n", clusterName, clusterset, o.Clusterset)
 	}
 
 	return nil

diff --git a/pkg/cmd/clusterset/add/options.go → pkg/cmd/clusterset/set/options.go b/pkg/cmd/clusterset/add/options.go → pkg/cmd/clusterset/set/options.go
@@ -1,5 +1,5 @@
 // Copyright Contributors to the Open Cluster Management project
-package add
+package set
 
 import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -15,8 +15,6 @@ type Options struct {
 	Clusters []string
 
 	Clusterset string
-
-	replace bool
 }
 
 func newOptions(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, streams genericclioptions.IOStreams) *Options {