Add antctl join command

Signed-off-by: hjiajing <hjiajing@vmware.com>
antrea-io · Jul 19, 2022 · 206a7a1 · 206a7a1
1 parent b254621
commit 206a7a1
Show file tree

Hide file tree

Showing 4 changed files with 394 additions and 3 deletions.
diff --git a/multicluster/controllers/multicluster/commonarea/remote_common_area.go b/multicluster/controllers/multicluster/commonarea/remote_common_area.go
@@ -120,7 +120,7 @@ func NewRemoteCommonArea(clusterID common.ClusterID, clusterSetID common.Cluster
 	clusterSetNamespace string) (CommonArea, error) {
 	klog.InfoS("Create a RemoteCommonArea", "Cluster", clusterID)
 
-	crtData, token, err := getSecretCACrtAndToken(secret)
+	crtData, token, err := GetSecretCACrtAndToken(secret)
 	if err != nil {
 		return nil, err
 	}
@@ -174,9 +174,9 @@ func NewRemoteCommonArea(clusterID common.ClusterID, clusterSetID common.Cluster
 }
 
 /**
- * getSecretCACrtAndToken returns the access credentials from Secret.
+ * GetSecretCACrtAndToken returns the access credentials from Secret.
  */
-func getSecretCACrtAndToken(secretObj *v1.Secret) ([]byte, []byte, error) {
+func GetSecretCACrtAndToken(secretObj *v1.Secret) ([]byte, []byte, error) {
 	caData, found := secretObj.Data[v1.ServiceAccountRootCAKey]
 	if !found {
 		return nil, nil, fmt.Errorf("ca.crt data not found in Secret %v", secretObj.GetName())

diff --git a/pkg/antctl/antctl.go b/pkg/antctl/antctl.go
@@ -621,6 +621,12 @@ $ antctl get podmulticaststats pod -n namespace`,
 			supportController: false,
 			commandGroup:      mc,
 		},
+		{
+			cobraCommand:      multicluster.JoinCmd,
+			supportAgent:      false,
+			supportController: false,
+			commandGroup:      mc,
+		},
 		{
 			cobraCommand:          set.SetCmd,
 			supportAgent:          false,

diff --git a/pkg/antctl/raw/multicluster/commands.go b/pkg/antctl/raw/multicluster/commands.go
@@ -22,6 +22,7 @@ import (
 	deleteCmd "antrea.io/antrea/pkg/antctl/raw/multicluster/delete"
 	"antrea.io/antrea/pkg/antctl/raw/multicluster/deploy"
 	"antrea.io/antrea/pkg/antctl/raw/multicluster/get"
+	"antrea.io/antrea/pkg/antctl/raw/multicluster/join"
 )
 
 var GetCmd = &cobra.Command{
@@ -49,6 +50,8 @@ var DeployCmd = &cobra.Command{
 	Short: "Deploy Antrea Multi-cluster Controller to a leader or member cluster",
 }
 
+var JoinCmd = join.NewJoinCommand()
+
 func init() {
 	GetCmd.AddCommand(get.NewClusterSetCommand())
 	GetCmd.AddCommand(get.NewResourceImportCommand())