Skip to content

Commit b7d6a95

Browse files
authored
Merge pull request #1607 from tencentcloudstack/fix/fix_as_doc
Fix/fix as doc
2 parents e83bc31 + a6472dd commit b7d6a95

File tree

5 files changed

+27
-6
lines changed

5 files changed

+27
-6
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
## 1.79.15 (March 14, 2023)
2+
3+
FEATURES:
4+
5+
* **New Data Source:** `tencentcloud_tcm_mesh` ([#1600](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1600))
6+
* **New Resource:** `tencentcloud_mariadb_instance` ([#1525](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1525))
7+
* **New Resource:** `tencentcloud_mps_person_sample` ([#1601](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1601))
8+
9+
ENHANCEMENTS:
10+
11+
* resource/tencentcloud_mysql_account: support import ([#1598](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1598))
12+
13+
BUG FIXES:
14+
15+
* resource/tencentcloud_vpn_connection: fix dpd_timeout read error ([#1597](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/1597))
16+
117
## 1.79.14 (March 08, 2023)
218

319
FEATURES:

tencentcloud/resource_tc_as_scaling_config.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
/*
22
Provides a resource to create a configuration for an AS (Auto scaling) instance.
33
4+
~> **NOTE:** In order to ensure the integrity of customer data, if the cvm instance was destroyed due to shrinking, it will keep the cbs associate with cvm by default. If you want to destroy together, please set `delete_with_instance` to `true`.
5+
6+
47
Example Usage
58
69
```hcl
@@ -142,7 +145,7 @@ func resourceTencentCloudAsScalingConfig() *schema.Resource {
142145
"delete_with_instance": {
143146
Type: schema.TypeBool,
144147
Optional: true,
145-
Description: "Indicates whether the disk remove after instance terminated.",
148+
Description: "Indicates whether the disk remove after instance terminated. Default is `false`.",
146149
},
147150
},
148151
},

tencentcloud/resource_tc_kubernetes_node_pool.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Provide a resource to create an auto scaling group for kubernetes cluster.
33
44
~> **NOTE:** We recommend the usage of one cluster with essential worker config + node pool to manage cluster and nodes. Its a more flexible way than manage worker config with tencentcloud_kubernetes_cluster, tencentcloud_kubernetes_scale_worker or exist node management of `tencentcloud_kubernetes_attachment`. Cause some unchangeable parameters of `worker_config` may cause the whole cluster resource `force new`.
55
6-
~> **NOTE:** In order to ensure the integrity of customer data, if you destroy nodepool instance, it will keep the cvm instance associate with nodepool by default. If you want destroy together, please set `delete_keep_instance` to `false`.
6+
~> **NOTE:** In order to ensure the integrity of customer data, if you destroy nodepool instance, it will keep the cvm instance associate with nodepool by default. If you want to destroy together, please set `delete_keep_instance` to `false`.
77
8-
~> **NOTE:** In order to ensure the integrity of customer data, if the cvm instance was destroyed due to shrinking, it will keep the cbs associate with cvm by default. If you want destroy together, please set `delete_with_instance` to `true`.
8+
~> **NOTE:** In order to ensure the integrity of customer data, if the cvm instance was destroyed due to shrinking, it will keep the cbs associate with cvm by default. If you want to destroy together, please set `delete_with_instance` to `true`.
99
1010
Example Usage
1111

website/docs/r/as_scaling_config.html.markdown

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ description: |-
1111

1212
Provides a resource to create a configuration for an AS (Auto scaling) instance.
1313

14+
~> **NOTE:** In order to ensure the integrity of customer data, if the cvm instance was destroyed due to shrinking, it will keep the cbs associate with cvm by default. If you want to destroy together, please set `delete_with_instance` to `true`.
15+
1416
## Example Usage
1517

1618
```hcl
@@ -87,7 +89,7 @@ The following arguments are supported:
8789

8890
The `data_disk` object supports the following:
8991

90-
* `delete_with_instance` - (Optional, Bool) Indicates whether the disk remove after instance terminated.
92+
* `delete_with_instance` - (Optional, Bool) Indicates whether the disk remove after instance terminated. Default is `false`.
9193
* `disk_size` - (Optional, Int) Volume of disk in GB. Default is `0`.
9294
* `disk_type` - (Optional, String) Types of disk. Valid values: `CLOUD_PREMIUM` and `CLOUD_SSD`. valid when disk_type_policy is ORIGINAL.
9395
* `snapshot_id` - (Optional, String) Data disk snapshot ID.

website/docs/r/kubernetes_node_pool.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Provide a resource to create an auto scaling group for kubernetes cluster.
1313

1414
~> **NOTE:** We recommend the usage of one cluster with essential worker config + node pool to manage cluster and nodes. Its a more flexible way than manage worker config with tencentcloud_kubernetes_cluster, tencentcloud_kubernetes_scale_worker or exist node management of `tencentcloud_kubernetes_attachment`. Cause some unchangeable parameters of `worker_config` may cause the whole cluster resource `force new`.
1515

16-
~> **NOTE:** In order to ensure the integrity of customer data, if you destroy nodepool instance, it will keep the cvm instance associate with nodepool by default. If you want destroy together, please set `delete_keep_instance` to `false`.
16+
~> **NOTE:** In order to ensure the integrity of customer data, if you destroy nodepool instance, it will keep the cvm instance associate with nodepool by default. If you want to destroy together, please set `delete_keep_instance` to `false`.
1717

18-
~> **NOTE:** In order to ensure the integrity of customer data, if the cvm instance was destroyed due to shrinking, it will keep the cbs associate with cvm by default. If you want destroy together, please set `delete_with_instance` to `true`.
18+
~> **NOTE:** In order to ensure the integrity of customer data, if the cvm instance was destroyed due to shrinking, it will keep the cbs associate with cvm by default. If you want to destroy together, please set `delete_with_instance` to `true`.
1919

2020
## Example Usage
2121

0 commit comments

Comments
 (0)