Skip to content

Commit 69282be

Browse files
authored
Merge pull request #2107 from andrew-tx/master
update as and tke docs
2 parents 3ac4fe7 + 4495bfa commit 69282be

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

tencentcloud/resource_tc_as_scaling_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ func resourceTencentCloudAsScalingConfig() *schema.Resource {
201201
Optional: true,
202202
Default: INTERNET_CHARGE_TYPE_TRAFFIC_POSTPAID_BY_HOUR,
203203
ValidateFunc: validateAllowedStringValue(INTERNET_CHARGE_ALLOW_TYPE),
204-
Description: "Charge types for network traffic. Valid values: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
204+
Description: "Charge types for network traffic. Valid values: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
205205
},
206206
"internet_max_bandwidth_out": {
207207
Type: schema.TypeInt,

tencentcloud/resource_tc_kubernetes_as_scaling_group.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func kubernetesAsScalingConfigPara() map[string]*schema.Schema {
196196
ForceNew: true,
197197
Default: INTERNET_CHARGE_TYPE_TRAFFIC_POSTPAID_BY_HOUR,
198198
ValidateFunc: validateAllowedStringValue(INTERNET_CHARGE_ALLOW_TYPE),
199-
Description: "Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
199+
Description: "Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
200200
},
201201
"internet_max_bandwidth_out": {
202202
Type: schema.TypeInt,

tencentcloud/resource_tc_kubernetes_node_pool.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ func composedKubernetesAsScalingConfigPara() map[string]*schema.Schema {
295295
Optional: true,
296296
Default: INTERNET_CHARGE_TYPE_TRAFFIC_POSTPAID_BY_HOUR,
297297
ValidateFunc: validateAllowedStringValue(INTERNET_CHARGE_ALLOW_TYPE),
298-
Description: "Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
298+
Description: "Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
299299
},
300300
"internet_max_bandwidth_out": {
301301
Type: schema.TypeInt,
@@ -425,7 +425,7 @@ func resourceTencentCloudKubernetesNodePool() *schema.Resource {
425425
Optional: true,
426426
Computed: true,
427427
ValidateFunc: validateIntegerInRange(0, 2000),
428-
Description: "Desired capacity ot the node. If `enable_auto_scale` is set `true`, this will be a computed parameter.",
428+
Description: "Desired capacity of the node. If `enable_auto_scale` is set `true`, this will be a computed parameter.",
429429
},
430430
"enable_auto_scale": {
431431
Type: schema.TypeBool,

website/docs/r/as_scaling_config.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ The following arguments are supported:
8989
* `instance_charge_type` - (Optional, String) Charge type of instance. Valid values are `PREPAID`, `POSTPAID_BY_HOUR`, `SPOTPAID`. The default is `POSTPAID_BY_HOUR`. NOTE: `SPOTPAID` instance must set `spot_instance_type` and `spot_max_price` at the same time.
9090
* `instance_name_settings` - (Optional, List) Settings of CVM instance names.
9191
* `instance_tags` - (Optional, Map) A list of tags used to associate different resources.
92-
* `internet_charge_type` - (Optional, String) Charge types for network traffic. Valid values: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.
92+
* `internet_charge_type` - (Optional, String) Charge types for network traffic. Valid values: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.
9393
* `internet_max_bandwidth_out` - (Optional, Int) Max bandwidth of Internet access in Mbps. Default is `0`.
9494
* `keep_image_login` - (Optional, Bool) Specify whether to keep original settings of a CVM image. And it can't be used with password or key_ids together.
9595
* `key_ids` - (Optional, List: [`String`]) ID list of keys.

website/docs/r/kubernetes_node_pool.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ The following arguments are supported:
165165
* `vpc_id` - (Required, String, ForceNew) ID of VPC network.
166166
* `default_cooldown` - (Optional, Int) Seconds of scaling group cool down. Default value is `300`.
167167
* `delete_keep_instance` - (Optional, Bool) Indicate to keep the CVM instance when delete the node pool. Default is `true`.
168-
* `desired_capacity` - (Optional, Int) Desired capacity ot the node. If `enable_auto_scale` is set `true`, this will be a computed parameter.
168+
* `desired_capacity` - (Optional, Int) Desired capacity of the node. If `enable_auto_scale` is set `true`, this will be a computed parameter.
169169
* `enable_auto_scale` - (Optional, Bool) Indicate whether to enable auto scaling or not.
170170
* `labels` - (Optional, Map) Labels of kubernetes node pool created nodes. The label key name does not exceed 63 characters, only supports English, numbers,'/','-', and does not allow beginning with ('/').
171171
* `multi_zone_subnet_policy` - (Optional, String) Multi-availability zone/subnet policy. Valid values: PRIORITY and EQUALITY. Default value: PRIORITY.
@@ -198,7 +198,7 @@ The `auto_scaling_config` object supports the following:
198198
* `instance_charge_type_prepaid_renew_flag` - (Optional, String) Auto renewal flag. Valid values: `NOTIFY_AND_AUTO_RENEW`: notify upon expiration and renew automatically, `NOTIFY_AND_MANUAL_RENEW`: notify upon expiration but do not renew automatically, `DISABLE_NOTIFY_AND_MANUAL_RENEW`: neither notify upon expiration nor renew automatically. Default value: `NOTIFY_AND_MANUAL_RENEW`. If this parameter is specified as `NOTIFY_AND_AUTO_RENEW`, the instance will be automatically renewed on a monthly basis if the account balance is sufficient. NOTE: it only works when instance_charge_type is set to `PREPAID`.
199199
* `instance_charge_type` - (Optional, String) Charge type of instance. Valid values are `PREPAID`, `POSTPAID_BY_HOUR`, `SPOTPAID`. The default is `POSTPAID_BY_HOUR`. NOTE: `SPOTPAID` instance must set `spot_instance_type` and `spot_max_price` at the same time.
200200
* `instance_name` - (Optional, String) Instance name, no more than 60 characters. For usage, refer to `InstanceNameSettings` in https://www.tencentcloud.com/document/product/377/31001.
201-
* `internet_charge_type` - (Optional, String) Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.
201+
* `internet_charge_type` - (Optional, String) Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.
202202
* `internet_max_bandwidth_out` - (Optional, Int) Max bandwidth of Internet access in Mbps. Default is `0`.
203203
* `key_ids` - (Optional, List, ForceNew) ID list of keys.
204204
* `orderly_security_group_ids` - (Optional, List) Ordered security groups to which a CVM instance belongs.

0 commit comments

Comments
 (0)