Skip to content

Commit ab6c00b

Browse files
lyu571lyu571
committed
feat(tke): [119299548]update tke doc and example
1 parent 5f3a2c2 commit ab6c00b

16 files changed

+30
-32
lines changed

‎tencentcloud/services/tke/resource_tc_kubernetes_addon.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ resource "tencentcloud_kubernetes_cluster" "example" {
2222
resource "tencentcloud_kubernetes_addon" "kubernetes_addon" {
2323
cluster_id = tencentcloud_kubernetes_cluster.example.id
2424
addon_name = "cos"
25-
addon_version = "2018-05-25"
26-
raw_values = "e30="
25+
raw_values = "{\"tolerations\":[{\"key\":\"test\",\"value\":\"100\",\"operator\":\"Equal\"}]}"
2726
}
2827
2928
```

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func ResourceTencentCloudKubernetesClusterAttachment() *schema.Resource {
104104
Optional: true,
105105
ForceNew: true,
106106
Default: "CLOUD_PREMIUM",
107-
Description: "Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`.",
107+
Description: "Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD` and `CLOUD_BSSD`.",
108108
ValidateFunc: tccommon.ValidateAllowedStringValue(svcas.SYSTEM_DISK_ALLOW_TYPE),
109109
},
110110
"disk_size": {
@@ -287,7 +287,7 @@ func ResourceTencentCloudKubernetesClusterAttachment() *schema.Resource {
287287
Optional: true,
288288
ForceNew: true,
289289
Default: "CLOUD_PREMIUM",
290-
Description: "Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`.",
290+
Description: "Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD` and `CLOUD_BSSD`.",
291291
ValidateFunc: tccommon.ValidateAllowedStringValue(svcas.SYSTEM_DISK_ALLOW_TYPE),
292292
},
293293
"disk_size": {

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment_extension.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ func TkeInstanceAdvancedSetting() map[string]*schema.Schema {
388388
Optional: true,
389389
Default: svcas.SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
390390
ValidateFunc: tccommon.ValidateAllowedStringValue(svcas.SYSTEM_DISK_ALLOW_TYPE),
391-
Description: "Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD`, `CLOUD_TSSD` and `CLOUD_BSSD`.",
391+
Description: "Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD` and `CLOUD_BSSD`.",
392392
},
393393
"disk_size": {
394394
Type: schema.TypeInt,

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster_extension.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2526,7 +2526,7 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
25262526
Optional: true,
25272527
Default: svcas.SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
25282528
ValidateFunc: tccommon.ValidateAllowedStringValue(svcas.SYSTEM_DISK_ALLOW_TYPE),
2529-
Description: "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.",
2529+
Description: "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD`.",
25302530
},
25312531
"disk_size": {
25322532
Type: schema.TypeInt,

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster_master_attachment.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tencentcloud/services/tke/resource_tc_kubernetes_native_node_pool.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tencentcloud/services/tke/resource_tc_kubernetes_scale_worker.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎website/docs/r/kubernetes_addon.html.markdown

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ resource "tencentcloud_kubernetes_cluster" "example" {
3030
}
3131
3232
resource "tencentcloud_kubernetes_addon" "kubernetes_addon" {
33-
cluster_id = tencentcloud_kubernetes_cluster.example.id
34-
addon_name = "cos"
35-
addon_version = "2018-05-25"
36-
raw_values = "e30="
33+
cluster_id = tencentcloud_kubernetes_cluster.example.id
34+
addon_name = "cos"
35+
raw_values = "{\"tolerations\":[{\"key\":\"test\",\"value\":\"100\",\"operator\":\"Equal\"}]}"
3736
}
3837
```
3938

‎website/docs/r/kubernetes_cluster.html.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ The `data_disk` object of `master_config` supports the following:
991991
* `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
992992
* `disk_partition` - (Optional, String, ForceNew) The name of the device or partition to mount.
993993
* `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
994-
* `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
994+
* `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD`.
995995
* `encrypt` - (Optional, Bool) Indicates whether to encrypt data disk, default `false`.
996996
* `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
997997
* `kms_key_id` - (Optional, String) ID of the custom CMK in the format of UUID or `kms-abcd1234`. This parameter is used to encrypt cloud disks.
@@ -1003,7 +1003,7 @@ The `data_disk` object of `master_config` supports the following:
10031003
* `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
10041004
* `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.
10051005
* `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
1006-
* `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`.
1006+
* `disk_type` - (Optional, String, ForceNew) Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD` and `CLOUD_BSSD`.
10071007
* `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
10081008
* `mount_target` - (Optional, String, ForceNew) Mount target.
10091009

@@ -1012,7 +1012,7 @@ The `data_disk` object of `worker_config` supports the following:
10121012
* `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
10131013
* `disk_partition` - (Optional, String, ForceNew) The name of the device or partition to mount.
10141014
* `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
1015-
* `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
1015+
* `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD`.
10161016
* `encrypt` - (Optional, Bool) Indicates whether to encrypt data disk, default `false`.
10171017
* `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
10181018
* `kms_key_id` - (Optional, String) ID of the custom CMK in the format of UUID or `kms-abcd1234`. This parameter is used to encrypt cloud disks.

‎website/docs/r/kubernetes_cluster_attachment.html.markdown

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

@@ -136,7 +136,7 @@ The `data_disk` object of `worker_config` supports the following:
136136
* `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
137137
* `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.
138138
* `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
139-
* `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`.
139+
* `disk_type` - (Optional, String, ForceNew) Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD` and `CLOUD_BSSD`.
140140
* `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
141141
* `mount_target` - (Optional, String, ForceNew) Mount target.
142142

‎website/docs/r/kubernetes_cluster_master_attachment.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The `data_disk` object of `master_config` supports the following:
7676
* `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
7777
* `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.
7878
* `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
79-
* `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`.
79+
* `disk_type` - (Optional, String, ForceNew) Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD` and `CLOUD_BSSD`.
8080
* `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
8181
* `mount_target` - (Optional, String, ForceNew) Mount target.
8282

‎website/docs/r/kubernetes_native_node_pool.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ The `data_disks` object of `native` supports the following:
127127

128128
* `auto_format_and_mount` - (Required, Bool) Whether to automatically format the disk and mount it.
129129
* `disk_size` - (Required, Int) Cloud disk size (G).
130-
* `disk_type` - (Required, String) Cloud disk type. Valid values: `CLOUD_PREMIUM`: Premium Cloud Storage, `CLOUD_SSD`: cloud SSD disk, `CLOUD_BSSD`: Basic SSD, `CLOUD_HSSD`: Enhanced SSD, `CLOUD_TSSD`: Tremendous SSD, `LOCAL_NVME`: local NVME disk.
130+
* `disk_type` - (Required, String) Cloud disk type. Valid values: `CLOUD_PREMIUM`: Premium Cloud Storage, `CLOUD_SSD`: cloud SSD disk, `CLOUD_BSSD`: Basic SSD, `CLOUD_HSSD`: Enhanced SSD, `LOCAL_NVME`: local NVME disk.
131131
* `disk_partition` - (Optional, String) Mount device name or partition name.
132132
* `encrypt` - (Optional, String) Pass in this parameter to create an encrypted cloud disk. The value is fixed to `ENCRYPT`.
133133
* `file_system` - (Optional, String) File system (ext3/ext4/xfs).

‎website/docs/r/kubernetes_node_pool.html.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,13 @@ The `auto_scaling_config` object supports the following:
216216
* `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`.
217217
* `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`.
218218
* `system_disk_size` - (Optional, Int) Volume of system disk in GB. Default is `50`.
219-
* `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`.
219+
* `system_disk_type` - (Optional, String) Type of a CVM disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD` and `CLOUD_BSSD`. Default is `CLOUD_PREMIUM`.
220220

221221
The `data_disk` object of `auto_scaling_config` supports the following:
222222

223223
* `delete_with_instance` - (Optional, Bool) Indicates whether the disk remove after instance terminated. Default is `false`.
224224
* `disk_size` - (Optional, Int) Volume of disk in GB. Default is `0`.
225-
* `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`.
225+
* `disk_type` - (Optional, String) Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD` and `CLOUD_BSSD`.
226226
* `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.
227227
* `snapshot_id` - (Optional, String, ForceNew) Data disk snapshot ID.
228228
* `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.
@@ -232,7 +232,7 @@ The `data_disk` object of `node_config` supports the following:
232232
* `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
233233
* `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.
234234
* `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
235-
* `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`.
235+
* `disk_type` - (Optional, String, ForceNew) Types of disk. Valid value: `LOCAL_BASIC`, `LOCAL_SSD`, `CLOUD_BASIC`, `CLOUD_PREMIUM`, `CLOUD_SSD`, `CLOUD_HSSD` and `CLOUD_BSSD`.
236236
* `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
237237
* `mount_target` - (Optional, String, ForceNew) Mount target.
238238

0 commit comments

Comments
 (0)