fix(alibaba): fix accessKey & accessSecret bug

Signed-off-by: Jason-ZW <zhenyang@rancher.com>
cnrancher · Sep 4, 2020 · ad4992d · ad4992d
1 parent f2889ee
commit ad4992d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -149,7 +149,13 @@ func InitK3sCluster(cluster *types.Cluster) error {
 
 	// deploy additional Alibaba cloud-controller-manager manifests.
 	if aliCCM != nil {
-		tmpl := fmt.Sprintf(alibabaCCMTmpl, aliCCM.AccessKey, aliCCM.AccessSecret)
+		var tmpl string
+		if cluster.ClusterCIDR == "" {
+			tmpl = fmt.Sprintf(alibabaCCMTmpl, aliCCM.AccessKey, aliCCM.AccessSecret, "10.42.0.0/16")
+		} else {
+			tmpl = fmt.Sprintf(alibabaCCMTmpl, aliCCM.AccessKey, aliCCM.AccessSecret, cluster.ClusterCIDR)
+		}
+
 		if _, err := execute(&hosts.Host{Node: cluster.MasterNodes[0]},
 			fmt.Sprintf(deployCCMCommand, tmpl, common.K3sManifestsDir), false); err != nil {
 			return err

diff --git a/pkg/cluster/template.go b/pkg/cluster/template.go
@@ -46,6 +46,7 @@ spec:
   valuesContent: |-
     accessKey: %s
     accessSecret: %s
+    clusterCIDR: %s
     rbac:
       create: true
     serviceAccount:

diff --git a/pkg/providers/alibaba/alibaba.go b/pkg/providers/alibaba/alibaba.go
@@ -224,8 +224,15 @@ func (p *Alibaba) Rollback() error {
 }
 
 func (p *Alibaba) generateClientSDK() error {
-	client, err := ecs.NewClientWithAccessKey(p.Region, viper.GetString(p.GetProviderName(), accessKeyID),
-		viper.GetString(p.GetProviderName(), accessKeySecret))
+	if p.AccessKey == "" {
+		p.AccessKey = viper.GetString(p.GetProviderName(), accessKeyID)
+	}
+
+	if p.AccessSecret == "" {
+		p.AccessSecret = viper.GetString(p.GetProviderName(), accessKeySecret)
+	}
+
+	client, err := ecs.NewClientWithAccessKey(p.Region, p.AccessKey, p.AccessSecret)
 	if err != nil {
 		return err
 	}