From 94010d599253affd5d2312fc359230c0782cbd10 Mon Sep 17 00:00:00 2001 From: bruceybian Date: Thu, 1 Feb 2024 11:37:20 +0800 Subject: [PATCH 1/2] update disk_type field description --- .../tke/resource_tc_kubernetes_cluster_attachment.go | 2 +- .../services/tke/resource_tc_kubernetes_node_pool.go | 4 ++-- website/docs/r/kubernetes_cluster_attachment.html.markdown | 4 ++-- website/docs/r/kubernetes_node_pool.html.markdown | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment.go b/tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment.go index 74883db615..487da50eda 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment.go @@ -83,7 +83,7 @@ func TkeInstanceAdvancedSetting() map[string]*schema.Schema { Optional: true, Default: svcas.SYSTEM_DISK_TYPE_CLOUD_PREMIUM, ValidateFunc: tccommon.ValidateAllowedStringValue(svcas.SYSTEM_DISK_ALLOW_TYPE), - Description: "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.", + Description: "Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`.", }, "disk_size": { Type: schema.TypeInt, diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go b/tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go index c832d3dce2..025e470af4 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go @@ -65,7 +65,7 @@ func composedKubernetesAsScalingConfigPara() map[string]*schema.Schema { Optional: true, Default: svcas.SYSTEM_DISK_TYPE_CLOUD_PREMIUM, ValidateFunc: tccommon.ValidateAllowedStringValue(svcas.SYSTEM_DISK_ALLOW_TYPE), - Description: "Type of a CVM disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`. Default is `CLOUD_PREMIUM`.", + Description: "Type of a CVM disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`. Default is `CLOUD_PREMIUM`.", }, "system_disk_size": { Type: schema.TypeInt, @@ -86,7 +86,7 @@ func composedKubernetesAsScalingConfigPara() map[string]*schema.Schema { //ForceNew: true, Default: svcas.SYSTEM_DISK_TYPE_CLOUD_PREMIUM, ValidateFunc: tccommon.ValidateAllowedStringValue(svcas.SYSTEM_DISK_ALLOW_TYPE), - Description: "Types of disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`.", + Description: "Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`.", }, "disk_size": { Type: schema.TypeInt, diff --git a/website/docs/r/kubernetes_cluster_attachment.html.markdown b/website/docs/r/kubernetes_cluster_attachment.html.markdown index 006ce0d5ce..cade2e9d7b 100644 --- a/website/docs/r/kubernetes_cluster_attachment.html.markdown +++ b/website/docs/r/kubernetes_cluster_attachment.html.markdown @@ -123,7 +123,7 @@ The `data_disk` object of `worker_config_overrides` supports the following: * `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`. * `disk_partition` - (Optional, String, ForceNew) The name of the device or partition to mount. NOTE: this argument doesn't support setting in node pool, or will leads to mount error. * `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`. -* `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`. +* `disk_type` - (Optional, String, ForceNew) Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`. * `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`. * `mount_target` - (Optional, String, ForceNew) Mount target. @@ -132,7 +132,7 @@ The `data_disk` object of `worker_config` supports the following: * `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`. * `disk_partition` - (Optional, String, ForceNew) The name of the device or partition to mount. NOTE: this argument doesn't support setting in node pool, or will leads to mount error. * `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`. -* `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`. +* `disk_type` - (Optional, String, ForceNew) Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`. * `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`. * `mount_target` - (Optional, String, ForceNew) Mount target. diff --git a/website/docs/r/kubernetes_node_pool.html.markdown b/website/docs/r/kubernetes_node_pool.html.markdown index a40a52af51..d44b7183c6 100644 --- a/website/docs/r/kubernetes_node_pool.html.markdown +++ b/website/docs/r/kubernetes_node_pool.html.markdown @@ -209,13 +209,13 @@ The `auto_scaling_config` object supports the following: * `spot_instance_type` - (Optional, String) Type of spot instance, only support `one-time` now. Note: it only works when instance_charge_type is set to `SPOTPAID`. * `spot_max_price` - (Optional, String) Max price of a spot instance, is the format of decimal string, for example "0.50". Note: it only works when instance_charge_type is set to `SPOTPAID`. * `system_disk_size` - (Optional, Int) Volume of system disk in GB. Default is `50`. -* `system_disk_type` - (Optional, String) Type of a CVM disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`. Default is `CLOUD_PREMIUM`. +* `system_disk_type` - (Optional, String) Type of a CVM disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`. Default is `CLOUD_PREMIUM`. The `data_disk` object of `auto_scaling_config` supports the following: * `delete_with_instance` - (Optional, Bool) Indicates whether the disk remove after instance terminated. Default is `false`. * `disk_size` - (Optional, Int) Volume of disk in GB. Default is `0`. -* `disk_type` - (Optional, String) Types of disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`. +* `disk_type` - (Optional, String) Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`. * `encrypt` - (Optional, Bool) Specify whether to encrypt data disk, default: false. NOTE: Make sure the instance type is offering and the cam role `QcloudKMSAccessForCVMRole` was provided. * `snapshot_id` - (Optional, String, ForceNew) Data disk snapshot ID. * `throughput_performance` - (Optional, Int) Add extra performance to the data disk. Only works when disk type is `CLOUD_TSSD` or `CLOUD_HSSD` and `data_size` > 460GB. @@ -225,7 +225,7 @@ The `data_disk` object of `node_config` supports the following: * `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`. * `disk_partition` - (Optional, String, ForceNew) The name of the device or partition to mount. NOTE: this argument doesn't support setting in node pool, or will leads to mount error. * `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`. -* `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`. +* `disk_type` - (Optional, String, ForceNew) Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`. * `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`. * `mount_target` - (Optional, String, ForceNew) Mount target. From f49ca874e46afb3eb2c9d0917608bd8740b10965 Mon Sep 17 00:00:00 2001 From: bruceybian Date: Thu, 1 Feb 2024 14:22:44 +0800 Subject: [PATCH 2/2] add changelog 2514.txt --- .changelog/2514.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2514.txt diff --git a/.changelog/2514.txt b/.changelog/2514.txt new file mode 100644 index 0000000000..e3ba8e3bb5 --- /dev/null +++ b/.changelog/2514.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_kubernetes_node_pool: update `system_disk_type` and `disk_type` field description +``` \ No newline at end of file