feat(autok3s): support multiple region scenario

cnrancher · Aug 20, 2020 · c90be86 · c90be86
1 parent 2e4ce1d
commit c90be86
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/cmd/create.go b/cmd/create.go
@@ -62,6 +62,10 @@ func CreateCommand() *cobra.Command {
 			logrus.Fatalln(err)
 		}
 
+		// generate cluster name. e.g. input: "--name k3s1 --region cn-hangzhou" output: "k3s1.cn-hangzhou"
+		cp.GenerateClusterName()
+
+		// create k3s cluster with generated cluster name.
 		if err := cp.CreateK3sCluster(cSSH); err != nil {
 			logrus.Errorln(err)
 			if rErr := cp.Rollback(); rErr != nil {

diff --git a/cmd/join.go b/cmd/join.go
@@ -62,6 +62,10 @@ func JoinCommand() *cobra.Command {
 			logrus.Fatalln(err)
 		}
 
+		// generate cluster name. e.g. input: "--name k3s1 --region cn-hangzhou" output: "k3s1.cn-hangzhou"
+		cp.GenerateClusterName()
+
+		// join k3s node to the cluster which named with generated cluster name.
 		if err := jp.JoinK3sNode(jSSH); err != nil {
 			logrus.Errorln(err)
 			if rErr := cp.Rollback(); rErr != nil {

diff --git a/pkg/common/common.go b/pkg/common/common.go
@@ -7,11 +7,11 @@ import (
 )
 
 const (
-	MasterInstancePrefix = "autok3s.%s.m"                   // autok3s.<cluster>.m
-	WorkerInstancePrefix = "autok3s.%s.w"                   // autok3s.<cluster>.w
-	MasterInstanceName   = MasterInstancePrefix + "[%d,%d]" // autok3s.<cluster>.m<index>
-	WorkerInstanceName   = WorkerInstancePrefix + "[%d,%d]" // autok3s.<cluster>.w<index>
-	WildcardInstanceName = "autok3s.%s.*"                   // autok3s.<cluster>.*
+	MasterInstancePrefix = "autok3s.%s.m"                   // autok3s.<cluster.region>.m
+	WorkerInstancePrefix = "autok3s.%s.w"                   // autok3s.<cluster.region>.w
+	MasterInstanceName   = MasterInstancePrefix + "[%d,%d]" // autok3s.<cluster.region>.m<index>
+	WorkerInstanceName   = WorkerInstancePrefix + "[%d,%d]" // autok3s.<cluster.region>.w<index>
+	WildcardInstanceName = "autok3s.%s.*"                   // autok3s.<cluster.region>.*
 	BindPrefix           = "autok3s.providers.%s.%s"
 	ConfigFile           = "config.yaml"
 	StateFile            = ".state"

diff --git a/pkg/providers/alibaba/alibaba.go b/pkg/providers/alibaba/alibaba.go
@@ -67,6 +67,10 @@ func (p *Alibaba) GetProviderName() string {
 	return "alibaba"
 }
 
+func (p *Alibaba) GenerateClusterName() {
+	p.Name = fmt.Sprintf("%s.%s", p.Name, p.Region)
+}
+
 func (p *Alibaba) CreateK3sCluster(ssh *types.SSH) error {
 	s := utils.NewSpinner("Generating K3s cluster: ")
 	s.Start()

diff --git a/pkg/providers/provider.go b/pkg/providers/provider.go
@@ -20,6 +20,8 @@ type Provider interface {
 	GetCredentialFlags(cmd *cobra.Command) *pflag.FlagSet
 	// Use this method to bind Viper, although it is somewhat repetitive.
 	BindCredentialFlags() *pflag.FlagSet
+	// Generate cluster name.
+	GenerateClusterName()
 	// K3s create cluster interface.
 	CreateK3sCluster(ssh *types.SSH) error
 	// K3s join node interface.