Skip to content

Commit e7dd860

Browse files
authored
Merge pull request #2104 from tencentcloudstack/feat/fix_docs
fix docs
2 parents 3949000 + 19bc843 commit e7dd860

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

tencentcloud/resource_tc_kubernetes_node_pool.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ resource "tencentcloud_kubernetes_node_pool" "mynodepool" {
5757
instance_type = var.default_instance_type
5858
system_disk_type = "CLOUD_PREMIUM"
5959
system_disk_size = "50"
60-
security_group_ids = ["sg-24vswocp"]
60+
orderly_security_group_ids = ["sg-24vswocp"]
6161
6262
data_disk {
6363
disk_type = "CLOUD_PREMIUM"
@@ -117,7 +117,7 @@ resource "tencentcloud_kubernetes_node_pool" "mynodepool" {
117117
instance_type = var.default_instance_type
118118
system_disk_type = "CLOUD_PREMIUM"
119119
system_disk_size = "50"
120-
security_group_ids = ["sg-24vswocp"]
120+
orderly_security_group_ids = ["sg-24vswocp", "sg-3qntci2v", "sg-7y1t2wax"]
121121
instance_charge_type = "SPOTPAID"
122122
spot_instance_type = "one-time"
123123
spot_max_price = "1000"

tencentcloud/resource_tc_tdmq_rocketmq_vip_instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func resourceTencentCloudTdmqRocketmqVipInstance() *schema.Resource {
7171
"spec": {
7272
Required: true,
7373
Type: schema.TypeString,
74-
Description: "Instance specification:Basic type, rocket-vip-basic-1Standard type, rocket-vip-basic-2Advanced Type I, rocket-vip-basic-3Advanced Type II, rocket-vip-basic-4.",
74+
Description: "Instance specification: Basic type: `rocket-vip-basic-1`, Standard type: `rocket-vip-basic-2`, Advanced Type I: `rocket-vip-basic-3`, Advanced Type II: `rocket-vip-basic-4`.",
7575
},
7676
"node_count": {
7777
Required: true,

tencentcloud/resource_tc_vpc_flow_log.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func resourceTencentCloudVpcFlowLog() *schema.Resource {
169169
"cloud_log_id": {
170170
Optional: true,
171171
Type: schema.TypeString,
172-
Description: "Specify flow log storage id.",
172+
Description: "Specify flow log storage id, just set cls topic id.",
173173
},
174174
"storage_type": {
175175
Optional: true,

website/docs/r/kubernetes_node_pool.html.markdown

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ resource "tencentcloud_kubernetes_node_pool" "mynodepool" {
6363
multi_zone_subnet_policy = "EQUALITY"
6464
6565
auto_scaling_config {
66-
instance_type = var.default_instance_type
67-
system_disk_type = "CLOUD_PREMIUM"
68-
system_disk_size = "50"
69-
security_group_ids = ["sg-24vswocp"]
66+
instance_type = var.default_instance_type
67+
system_disk_type = "CLOUD_PREMIUM"
68+
system_disk_size = "50"
69+
orderly_security_group_ids = ["sg-24vswocp"]
7070
7171
data_disk {
7272
disk_type = "CLOUD_PREMIUM"
@@ -124,13 +124,13 @@ resource "tencentcloud_kubernetes_node_pool" "mynodepool" {
124124
multi_zone_subnet_policy = "EQUALITY"
125125
126126
auto_scaling_config {
127-
instance_type = var.default_instance_type
128-
system_disk_type = "CLOUD_PREMIUM"
129-
system_disk_size = "50"
130-
security_group_ids = ["sg-24vswocp"]
131-
instance_charge_type = "SPOTPAID"
132-
spot_instance_type = "one-time"
133-
spot_max_price = "1000"
127+
instance_type = var.default_instance_type
128+
system_disk_type = "CLOUD_PREMIUM"
129+
system_disk_size = "50"
130+
orderly_security_group_ids = ["sg-24vswocp", "sg-3qntci2v", "sg-7y1t2wax"]
131+
instance_charge_type = "SPOTPAID"
132+
spot_instance_type = "one-time"
133+
spot_max_price = "1000"
134134
135135
data_disk {
136136
disk_type = "CLOUD_PREMIUM"

website/docs/r/tdmq_rocketmq_vip_instance.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The following arguments are supported:
5757

5858
* `name` - (Required, String) Instance name.
5959
* `node_count` - (Required, Int) Number of nodes, minimum 2, maximum 20.
60-
* `spec` - (Required, String) Instance specification:Basic type, rocket-vip-basic-1Standard type, rocket-vip-basic-2Advanced Type I, rocket-vip-basic-3Advanced Type II, rocket-vip-basic-4.
60+
* `spec` - (Required, String) Instance specification: Basic type: `rocket-vip-basic-1`, Standard type: `rocket-vip-basic-2`, Advanced Type I: `rocket-vip-basic-3`, Advanced Type II: `rocket-vip-basic-4`.
6161
* `storage_size` - (Required, Int) Single node storage space, in GB, minimum 200GB.
6262
* `time_span` - (Required, Int) Purchase period, in months.
6363
* `vpc_info` - (Required, List) VPC information.

website/docs/r/vpc_flow_log.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ The following arguments are supported:
121121
* `resource_id` - (Required, String) Specify resource unique Id of `resource_type` configured.
122122
* `resource_type` - (Required, String) Specify resource type. NOTE: Only support `NETWORKINTERFACE` for now. Values: `VPC`, `SUBNET`, `NETWORKINTERFACE`, `CCN`, `NAT`, `DCG`.
123123
* `traffic_type` - (Required, String) Specify log traffic type, values: `ACCEPT`, `REJECT`, `ALL`.
124-
* `cloud_log_id` - (Optional, String) Specify flow log storage id.
124+
* `cloud_log_id` - (Optional, String) Specify flow log storage id, just set cls topic id.
125125
* `cloud_log_region` - (Optional, String) Specify flow log storage region, default using current.
126126
* `flow_log_description` - (Optional, String) Specify flow Log description.
127127
* `flow_log_storage` - (Optional, List) Specify consumer detail, required while `storage_type` is `ckafka`.

0 commit comments

Comments
 (0)