feat: tke support worker data disk mount setting

Author: Kagashino

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.58.1 (Aug 17, 2021)
+ENHANCEMENTS:
+* Resource `resource_tc_kubernetes_cluster.go` extend worker instance data disk mount settings
+
 ## 1.58.0 (Aug 11, 2021)
 
 FEATURES:

tencentcloud/resource_tc_container_cluster.go

@@ -449,7 +449,7 @@ func resourceTencentCloudContainerClusterCreate(d *schema.ResourceData, meta int
 	runInstancesParas := runInstancesPara.ToJsonString()
 	cvms.Work = []string{runInstancesParas}
 
-	id, err := service.CreateCluster(ctx, basic, cAdvanced, cvms, iAdvanced, cidrSet, map[string]string{}, nil, nil)
+	id, err := service.CreateCluster(ctx, basic, cAdvanced, cvms, iAdvanced, cidrSet, map[string]string{}, nil, nil, nil)
 	if err != nil {
 		return err
 	}

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -43,6 +43,10 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
   cluster_internet                           = true
   managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]
   cluster_deploy_type                        = "MANAGED_CLUSTER"
+  data_disk {
+	disk_type = "CLOUD_PREMIUM"
+	disk_size = 50
+  }
 
   worker_config {
     count                      = 1
@@ -460,6 +464,25 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
 						Optional:    true,
 						Description: "Data disk snapshot ID.",
 					},
+					"file_system": {
+						Type: schema.TypeString,
+						ForceNew: true,
+						Optional: true,
+						Description: "File system, e.g. `ext3/ext4/xfs`.",
+					},
+					"auto_format_and_mount": {
+						Type: schema.TypeBool,
+						ForceNew: true,
+						Optional: true,
+						Default: true,
+						Description: "Indicate whether to auto format and mount or not. Default is `false`.",
+					},
+					"mount_target": {
+						Type: schema.TypeString,
+						ForceNew: true,
+						Optional: true,
+						Description: "Mount target.",
+					},
 				},
 			},
 		},
@@ -1492,15 +1515,16 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
 	var (
-		basic            ClusterBasicSetting
-		advanced         ClusterAdvancedSettings
-		cvms             RunInstancesForNode
-		iAdvanced        InstanceAdvancedSettings
-		cidrSet          ClusterCidrSettings
-		securityPolicies []string
-		clusterInternet  = d.Get("cluster_internet").(bool)
-		clusterIntranet  = d.Get("cluster_intranet").(bool)
-		intranetSubnetId = d.Get("cluster_intranet_subnet_id").(string)
+		basic            	ClusterBasicSetting
+		advanced         	ClusterAdvancedSettings
+		cvms             	RunInstancesForNode
+		iAdvanced        	InstanceAdvancedSettings
+		iDiskMountSettings	[]*tke.InstanceDataDiskMountSetting
+		cidrSet          	ClusterCidrSettings
+		securityPolicies 	[]string
+		clusterInternet  	= d.Get("cluster_internet").(bool)
+		clusterIntranet  	= d.Get("cluster_intranet").(bool)
+		intranetSubnetId 	= d.Get("cluster_intranet_subnet_id").(string)
 	)
 
 	if temp, ok := d.GetOkExists("managed_cluster_internet_security_policies"); ok {
@@ -1686,6 +1710,46 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 					overrideSettings.Work = append(overrideSettings.Work, tke.InstanceAdvancedSettings{DesiredPodNumber: helper.Int64(dpNum)})
 				}
 			}
+
+			if v, ok := worker["data_disk"]; ok {
+				var (
+					instanceType = worker["instance_type"].(string)
+					zone = worker["availability_zone"].(string)
+				)
+				iDiskMountSetting := &tke.InstanceDataDiskMountSetting{
+					InstanceType: &instanceType,
+					Zone: &zone,
+				}
+
+				diskList := v.([]interface{})
+				for _, d := range diskList {
+					var (
+						disk      = d.(map[string]interface{})
+						diskType = disk["disk_type"].(string)
+						diskSize = int64(disk["disk_size"].(int))
+						fileSystem = disk["file_system"].(string)
+						autoFormatAndMount = disk["auto_format_and_mount"].(bool)
+						mountTarget = disk["mount_target"].(string)
+					)
+
+					dataDisk := &tke.DataDisk{
+						DiskType: &diskType,
+						DiskSize: &diskSize,
+						AutoFormatAndMount: &autoFormatAndMount,
+					}
+
+					if fileSystem != "" {
+						dataDisk.FileSystem = &fileSystem
+					}
+					if mountTarget != "" {
+						dataDisk.MountTarget = &mountTarget
+					}
+
+					iDiskMountSetting.DataDisks = append(iDiskMountSetting.DataDisks, dataDisk)
+				}
+
+				iDiskMountSettings = append(iDiskMountSettings, iDiskMountSetting)
+			}
 		}
 	}
 
@@ -1713,23 +1777,23 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 	}
 
 	// ExistedInstancesForNode
-	existIntances := make([]*tke.ExistedInstancesForNode, 0)
+	existInstances := make([]*tke.ExistedInstancesForNode, 0)
 	if instances, ok := d.GetOk("exist_instance"); ok {
 		instanceList := instances.([]interface{})
 		for index := range instanceList {
 			instance := instanceList[index].(map[string]interface{})
 			existedInstance, _ := tkeGetCvmExistInstancesPara(instance)
-			existIntances = append(existIntances, &existedInstance)
+			existInstances = append(existInstances, &existedInstance)
 		}
 	}
 
 	// RunInstancesForNode（master_config+worker_config) 和 ExistedInstancesForNode 不能同时存在
-	if len(cvms.Master)+len(cvms.Work) > 0 && len(existIntances) > 0 {
+	if len(cvms.Master)+len(cvms.Work) > 0 && len(existInstances) > 0 {
 		return fmt.Errorf("master_config+worker_config and exist_instance can not exist at the same time")
 	}
 
 	service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
-	id, err := service.CreateCluster(ctx, basic, advanced, cvms, iAdvanced, cidrSet, tags, existIntances, &overrideSettings)
+	id, err := service.CreateCluster(ctx, basic, advanced, cvms, iAdvanced, cidrSet, tags, existInstances, &overrideSettings, iDiskMountSettings)
 	if err != nil {
 		return err
 	}

tencentcloud/service_tencentcloud_tke.go

@@ -60,6 +60,7 @@ type InstanceAdvancedSettings struct {
 	Unschedulable   int64
 	DesiredPodNum   int64
 	Labels          []*tke.Label
+	DataDisks		[]*tke.DataDisk
 	ExtraArgs       tke.InstanceExtraArgs
 }
 
@@ -82,12 +83,13 @@ type ClusterInfo struct {
 }
 
 type InstanceInfo struct {
-	InstanceId               string
-	InstanceRole             string
-	InstanceState            string
-	FailedReason             string
-	InstanceAdvancedSettings *tke.InstanceAdvancedSettings
-	LanIp                    string
+	InstanceId               		string
+	InstanceRole             		string
+	InstanceState            		string
+	FailedReason             		string
+	InstanceAdvancedSettings 		*tke.InstanceAdvancedSettings
+	InstanceDataDiskMountSetting	*tke.InstanceDataDiskMountSetting
+	LanIp                    		string
 }
 
 type TkeService struct {
@@ -395,6 +397,7 @@ func (me *TkeService) CreateCluster(ctx context.Context,
 	tags map[string]string,
 	existedInstance []*tke.ExistedInstancesForNode,
 	overrideSettings *OverrideSettings,
+	iDiskMountSettings []*tke.InstanceDataDiskMountSetting,
 ) (id string, errRet error) {
 
 	logId := getLogId(ctx)
@@ -459,6 +462,10 @@ func (me *TkeService) CreateCluster(ctx context.Context,
 		request.InstanceAdvancedSettings.Labels = iAdvanced.Labels
 	}
 
+	if len(iAdvanced.DataDisks) > 0 {
+		request.InstanceAdvancedSettings.DataDisks = iAdvanced.DataDisks
+	}
+
 	if len(overrideSettings.Master)+len(overrideSettings.Work) > 0 &&
 		len(overrideSettings.Master)+len(overrideSettings.Work) != (len(cvms.Master)+len(cvms.Work)) {
 		return "", fmt.Errorf("len(overrideSettings) != (len(cvms.Master)+len(cvms.Work))")
@@ -497,6 +504,10 @@ func (me *TkeService) CreateCluster(ctx context.Context,
 		request.RunInstancesForNode = append(request.RunInstancesForNode, &node)
 	}
 
+	if len(iDiskMountSettings) != 0 {
+		request.InstanceDataDiskMountSettings = iDiskMountSettings
+	}
+
 	request.ClusterCIDRSettings = &tke.ClusterCIDRSettings{}
 
 	maxNodePodNum := uint64(cidrSetting.MaxNodePodNum)

website/docs/r/kubernetes_cluster.html.markdown

@@ -53,6 +53,10 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
   cluster_internet                           = true
   managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]
   cluster_deploy_type                        = "MANAGED_CLUSTER"
+  data_disk {
+    disk_type = "CLOUD_PREMIUM"
+    disk_size = 50
+  }
 
   worker_config {
     count                      = 1
@@ -329,8 +333,11 @@ The `cluster_extra_args` object supports the following:
 
 The `data_disk` object supports the following:
 
+* `auto_format_and_mount` - (Optional, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
 * `disk_size` - (Optional, ForceNew) Volume of disk in GB. Default is `0`.
 * `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
+* `file_system` - (Optional, ForceNew) File system, e.g. `ext3/ext4/xfs`.
+* `mount_target` - (Optional, ForceNew) Mount target.
 * `snapshot_id` - (Optional, ForceNew) Data disk snapshot ID.
 
 The `exist_instance` object supports the following:

website/docs/r/kubernetes_scale_worker.html.markdown

@@ -134,8 +134,11 @@ The `data_disk` object supports the following:
 
 The `data_disk` object supports the following:
 
+* `auto_format_and_mount` - (Optional, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
 * `disk_size` - (Optional, ForceNew) Volume of disk in GB. Default is `0`.
 * `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
+* `file_system` - (Optional, ForceNew) File system, e.g. `ext3/ext4/xfs`.
+* `mount_target` - (Optional, ForceNew) Mount target.
 * `snapshot_id` - (Optional, ForceNew) Data disk snapshot ID.
 
 The `worker_config` object supports the following:

website/docs/r/mysql_instance.html.markdown

@@ -56,6 +56,7 @@ The following arguments are supported:
 * `auto_renew_flag` - (Optional) Auto renew flag. NOTES: Only supported prepaid instance.
 * `availability_zone` - (Optional, ForceNew) Indicates which availability zone will be used.
 * `charge_type` - (Optional, ForceNew) Pay type of instance. Valid values:`PREPAID`, `POSTPAID`. Default is `POSTPAID`.
+* `cpu` - (Optional) CPU cores.
 * `engine_version` - (Optional, ForceNew) The version number of the database engine to use. Supported versions include 5.5/5.6/5.7/8.0, and default is 5.7.
 * `first_slave_zone` - (Optional, ForceNew) Zone information about first slave instance.
 * `force_delete` - (Optional) Indicate whether to delete instance directly or not. Default is `false`. If set true, the instance will be deleted instead of staying recycle bin. Note: only works for `PREPAID` instance. When the main mysql instance set true, this para of the readonly mysql instance will not take effect.

website/docs/r/mysql_readonly_instance.html.markdown

@@ -42,6 +42,7 @@ The following arguments are supported:
 * `volume_size` - (Required) Disk size (in GB).
 * `auto_renew_flag` - (Optional) Auto renew flag. NOTES: Only supported prepaid instance.
 * `charge_type` - (Optional, ForceNew) Pay type of instance. Valid values:`PREPAID`, `POSTPAID`. Default is `POSTPAID`.
+* `cpu` - (Optional) CPU cores.
 * `force_delete` - (Optional) Indicate whether to delete instance directly or not. Default is `false`. If set true, the instance will be deleted instead of staying recycle bin. Note: only works for `PREPAID` instance. When the main mysql instance set true, this para of the readonly mysql instance will not take effect.
 * `intranet_port` - (Optional) Public access port. Valid value ranges: [1024~65535]. The default value is `3306`.
 * `pay_type` - (Optional, **Deprecated**) It has been deprecated from version 1.36.0. Please use `charge_type` instead. Pay type of instance. Valid values: `0`, `1`. `0`: prepaid, `1`: postpaid.