Skip to content

Commit 61ee10e

Browse files
authored
update disk_type field description (#2514)
* update disk_type field description * add changelog 2514.txt
1 parent f58687b commit 61ee10e

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

.changelog/2514.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_kubernetes_node_pool: update `system_disk_type` and `disk_type` field description
3+
```

tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TkeInstanceAdvancedSetting() map[string]*schema.Schema {
8383
Optional: true,
8484
Default: svcas.SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
8585
ValidateFunc: tccommon.ValidateAllowedStringValue(svcas.SYSTEM_DISK_ALLOW_TYPE),
86-
Description: "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.",
86+
Description: "Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`.",
8787
},
8888
"disk_size": {
8989
Type: schema.TypeInt,

tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func composedKubernetesAsScalingConfigPara() map[string]*schema.Schema {
6565
Optional: true,
6666
Default: svcas.SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
6767
ValidateFunc: tccommon.ValidateAllowedStringValue(svcas.SYSTEM_DISK_ALLOW_TYPE),
68-
Description: "Type of a CVM disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`. Default is `CLOUD_PREMIUM`.",
68+
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`.",
6969
},
7070
"system_disk_size": {
7171
Type: schema.TypeInt,
@@ -86,7 +86,7 @@ func composedKubernetesAsScalingConfigPara() map[string]*schema.Schema {
8686
//ForceNew: true,
8787
Default: svcas.SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
8888
ValidateFunc: tccommon.ValidateAllowedStringValue(svcas.SYSTEM_DISK_ALLOW_TYPE),
89-
Description: "Types of disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`.",
89+
Description: "Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`.",
9090
},
9191
"disk_size": {
9292
Type: schema.TypeInt,

website/docs/r/kubernetes_cluster_attachment.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ The `data_disk` object of `worker_config_overrides` supports the following:
123123
* `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
124124
* `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.
125125
* `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
126-
* `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.
126+
* `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`.
127127
* `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
128128
* `mount_target` - (Optional, String, ForceNew) Mount target.
129129

@@ -132,7 +132,7 @@ The `data_disk` object of `worker_config` supports the following:
132132
* `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
133133
* `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.
134134
* `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
135-
* `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.
135+
* `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`.
136136
* `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
137137
* `mount_target` - (Optional, String, ForceNew) Mount target.
138138

website/docs/r/kubernetes_node_pool.html.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,13 @@ The `auto_scaling_config` object supports the following:
209209
* `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`.
210210
* `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`.
211211
* `system_disk_size` - (Optional, Int) Volume of system disk in GB. Default is `50`.
212-
* `system_disk_type` - (Optional, String) Type of a CVM disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`. Default is `CLOUD_PREMIUM`.
212+
* `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`.
213213

214214
The `data_disk` object of `auto_scaling_config` supports the following:
215215

216216
* `delete_with_instance` - (Optional, Bool) Indicates whether the disk remove after instance terminated. Default is `false`.
217217
* `disk_size` - (Optional, Int) Volume of disk in GB. Default is `0`.
218-
* `disk_type` - (Optional, String) Types of disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`.
218+
* `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`.
219219
* `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.
220220
* `snapshot_id` - (Optional, String, ForceNew) Data disk snapshot ID.
221221
* `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:
225225
* `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
226226
* `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.
227227
* `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
228-
* `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.
228+
* `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`.
229229
* `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
230230
* `mount_target` - (Optional, String, ForceNew) Mount target.
231231

0 commit comments

Comments
 (0)