Merge pull request #640 from rostachen/master

TkeCvmCreateInfo.data_disk.disk_type support CLOUD_HSSD and CLOUD_TSSD

Author: ivandksun

CHANGELOG.md

@@ -1,4 +1,10 @@
-## 1.56.13 (Unreleased)
+## 1.56.14 (Unreleased)
+
+## 1.56.13 (July 02, 2021)
+
+BUG FIXES
+ 
+* Resource `TkeCvmCreateInfo.data_disk.disk_type` support CLOUD_HSSD and CLOUD_TSSD
 
 ## 1.56.12 (July 02, 2021)
 

tencentcloud/extension_as.go

@@ -6,11 +6,15 @@ const (
 	SYSTEM_DISK_TYPE_CLOUD_BASIC   = "CLOUD_BASIC"
 	SYSTEM_DISK_TYPE_CLOUD_PREMIUM = "CLOUD_PREMIUM"
 	SYSTEM_DISK_TYPE_CLOUD_SSD     = "CLOUD_SSD"
+	SYSTEM_DISK_TYPE_CLOUD_HSSD    = "CLOUD_HSSD"
+	SYSTEM_DISK_TYPE_CLOUD_TSSD    = "CLOUD_TSSD"
 )
 
 var SYSTEM_DISK_ALLOW_TYPE = []string{
 	SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
 	SYSTEM_DISK_TYPE_CLOUD_SSD,
+	SYSTEM_DISK_TYPE_CLOUD_HSSD,
+	SYSTEM_DISK_TYPE_CLOUD_TSSD,
 }
 
 const (

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -444,8 +444,8 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
 						ForceNew:     true,
 						Optional:     true,
 						Default:      SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
-						//ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
-						Description:  "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD`.",
+						ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
+						Description:  "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.",
 					},
 					"disk_size": {
 						Type:        schema.TypeInt,

tencentcloud/resource_tc_kubernetes_scale_worker.go

@@ -194,7 +194,7 @@ func resourceTencentCloudTkeScaleWorker() *schema.Resource {
 							Optional:     true,
 							Default:      SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
 							ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
-							Description:  "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.",
+							Description:  "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.",
 						},
 						"disk_size": {
 							Type:        schema.TypeInt,

website/docs/r/kubernetes_cluster.html.markdown

@@ -330,7 +330,7 @@ The `cluster_extra_args` object supports the following:
 The `data_disk` object supports the following:
 
 * `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`.
+* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
 * `snapshot_id` - (Optional, ForceNew) Data disk snapshot ID.
 
 The `exist_instance` object supports the following:

website/docs/r/kubernetes_scale_worker.html.markdown

@@ -128,14 +128,14 @@ 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`.
+* `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.
 
 The `data_disk` object supports the following:
 
 * `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`.
+* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
 * `snapshot_id` - (Optional, ForceNew) Data disk snapshot ID.
 
 The `worker_config` object supports the following: