remove vpcID and subnetID from the command line arguments and specify vpcID and subnetID through the parameters field in the CSI object

Author: wangao1236

pkg/config/config.go

@@ -68,16 +68,10 @@ type TencentCloudConfig struct {
 	SecretID string
 	// Secret Key of Tencent Cloud
 	SecretKey string
-	// VpcID used in TencentCloud CFS storage
-	VpcID string
-	// SubnetID used in TencentCloud CFS storage
-	SubnetID string
 }
 
 // AddFlags add the TencentCloud configurations to global flag.
 func (c *TencentCloudConfig) AddFlags() {
 	flag.StringVar(&c.SecretID, "tencent-cloud-secret-id", "admin", "API Secret ID of Tencent Cloud")
 	flag.StringVar(&c.SecretKey, "tencent-cloud-secret-key", "admin", "API Secret Key of Tencent Cloud")
-	flag.StringVar(&c.VpcID, "tencent-cloud-cfs-vpc-id", "vpc-xxxxxxxx", "VpcID used in TencentCloud CFS storage")
-	flag.StringVar(&c.SubnetID, "tencent-cloud-cfs-subnet-id", "subnet-xxxxxxxx", "SubnetID used in TencentCloud CFS storage")
 }

pkg/controller/csi/enhancer/tencentCloud.go

@@ -20,6 +20,7 @@ package enhancer
 import (
 	"encoding/base64"
 	"fmt"
+
 	csiv1 "tkestack.io/csi-operator/pkg/apis/storage/v1"
 	"tkestack.io/csi-operator/pkg/config"
 	"tkestack.io/csi-operator/pkg/types"
@@ -331,26 +332,26 @@ func (e *tencentCloudEnhancer) getTencentInfo(csiDeploy *csiv1.CSI) (*tencentClo
 		secretKey = e.config.SecretKey
 	}
 
-	vpcID := csiDeploy.Spec.Parameters[vpcID]
-	if len(vpcID) == 0 {
-		vpcID = e.config.VpcID
+	if len(secretID) == 0 || len(secretKey) == 0 {
+		return nil, fmt.Errorf("no tencent info of secretID, secretKey in csiDeploy.Spec.Parameters: %v", csiDeploy.Spec.Parameters)
 	}
 
+	vpcID := csiDeploy.Spec.Parameters[vpcID]
+
 	subnetID := csiDeploy.Spec.Parameters[subnetID]
-	if len(subnetID) == 0 {
-		subnetID = e.config.SubnetID
-	}
 
-	if len(secretID) > 0 && len(secretKey) > 0 && len(subnetID) > 0 && len(vpcID) > 0 {
-		return &tencentCloudInfo{
-			SecretID:  secretID,
-			SecretKey: secretKey,
-			VpcID:     vpcID,
-			SubnetID:  subnetID,
-		}, nil
+	if csiDeploy.Spec.DriverName == csiv1.CSIDriverTencentCFS {
+		if len(vpcID) == 0 || len(subnetID) == 0 {
+			return nil, fmt.Errorf("no tencent info of vpcID, subnetID in csiDeploy.Spec.Parameters: %v", csiDeploy.Spec.Parameters)
+		}
 	}
 
-	return nil, fmt.Errorf("no tencent info of secretID, secretKey, vpcID or subnetID found in csiDeploy.Spec.Parameters: %v", csiDeploy.Spec.Parameters)
+	return &tencentCloudInfo{
+		SecretID:  secretID,
+		SecretKey: secretKey,
+		VpcID:     vpcID,
+		SubnetID:  subnetID,
+	}, nil
 }
 
 // generateCBSSecretAndSCs generates secrets and StorageClasses needed by TencentCloud CBS storage.