Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_as_scaling_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func resourceTencentCloudAsScalingConfig() *schema.Resource {
Optional: true,
Default: INTERNET_CHARGE_TYPE_TRAFFIC_POSTPAID_BY_HOUR,
ValidateFunc: validateAllowedStringValue(INTERNET_CHARGE_ALLOW_TYPE),
Description: "Charge types for network traffic. Valid values: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
Description: "Charge types for network traffic. Valid values: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
},
"internet_max_bandwidth_out": {
Type: schema.TypeInt,
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_kubernetes_as_scaling_group.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func kubernetesAsScalingConfigPara() map[string]*schema.Schema {
ForceNew: true,
Default: INTERNET_CHARGE_TYPE_TRAFFIC_POSTPAID_BY_HOUR,
ValidateFunc: validateAllowedStringValue(INTERNET_CHARGE_ALLOW_TYPE),
Description: "Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
Description: "Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
},
"internet_max_bandwidth_out": {
Type: schema.TypeInt,
Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/resource_tc_kubernetes_node_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func composedKubernetesAsScalingConfigPara() map[string]*schema.Schema {
Optional: true,
Default: INTERNET_CHARGE_TYPE_TRAFFIC_POSTPAID_BY_HOUR,
ValidateFunc: validateAllowedStringValue(INTERNET_CHARGE_ALLOW_TYPE),
Description: "Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
Description: "Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
},
"internet_max_bandwidth_out": {
Type: schema.TypeInt,
Expand Down Expand Up @@ -425,7 +425,7 @@ func resourceTencentCloudKubernetesNodePool() *schema.Resource {
Optional: true,
Computed: true,
ValidateFunc: validateIntegerInRange(0, 2000),
Description: "Desired capacity ot the node. If `enable_auto_scale` is set `true`, this will be a computed parameter.",
Description: "Desired capacity of the node. If `enable_auto_scale` is set `true`, this will be a computed parameter.",
},
"enable_auto_scale": {
Type: schema.TypeBool,
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/as_scaling_config.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ The following arguments are supported:
* `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.
* `instance_name_settings` - (Optional, List) Settings of CVM instance names.
* `instance_tags` - (Optional, Map) A list of tags used to associate different resources.
* `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`.
* `internet_charge_type` - (Optional, String) Charge types for network traffic. Valid values: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.
* `internet_max_bandwidth_out` - (Optional, Int) Max bandwidth of Internet access in Mbps. Default is `0`.
* `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.
* `key_ids` - (Optional, List: [`String`]) ID list of keys.
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/kubernetes_node_pool.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ The following arguments are supported:
* `vpc_id` - (Required, String, ForceNew) ID of VPC network.
* `default_cooldown` - (Optional, Int) Seconds of scaling group cool down. Default value is `300`.
* `delete_keep_instance` - (Optional, Bool) Indicate to keep the CVM instance when delete the node pool. Default is `true`.
* `desired_capacity` - (Optional, Int) Desired capacity ot the node. If `enable_auto_scale` is set `true`, this will be a computed parameter.
* `desired_capacity` - (Optional, Int) Desired capacity of the node. If `enable_auto_scale` is set `true`, this will be a computed parameter.
* `enable_auto_scale` - (Optional, Bool) Indicate whether to enable auto scaling or not.
* `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 ('/').
* `multi_zone_subnet_policy` - (Optional, String) Multi-availability zone/subnet policy. Valid values: PRIORITY and EQUALITY. Default value: PRIORITY.
Expand Down Expand Up @@ -198,7 +198,7 @@ The `auto_scaling_config` object supports the following:
* `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`.
* `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.
* `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.
* `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`.
* `internet_charge_type` - (Optional, String) Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.
* `internet_max_bandwidth_out` - (Optional, Int) Max bandwidth of Internet access in Mbps. Default is `0`.
* `key_ids` - (Optional, List, ForceNew) ID list of keys.
* `orderly_security_group_ids` - (Optional, List) Ordered security groups to which a CVM instance belongs.
Expand Down