Skip to content

Commit f552fa2

Browse files
authored
Remove limit of CVM DATA DISK (#595)
1 parent 328eb83 commit f552fa2

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
## 1.53.8 (Unreleased)
2-
## 1.53.7 (March 09, 2021)
1+
## 1.53.7 (Unreleased)
32

43
ENHANCEMENTS:
54

65
* Resource `tencentcloud_kubernetes_node_pool` add `internet_max_bandwidth_out`, `public_ip_assigned` to support internet traffic setting.
6+
* Resource `tencentcloud_instance` remove limit of `data_disk_size`.
77

88
## 1.53.6 (March 09, 2021)
99

tencentcloud/extension_tke.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const (
5656
TKE_CLUSTER_OS_TYPE_GENERAL = "GENERAL"
5757
)
5858

59-
var TKE_CLUSTER_OS_TYPES = []string{ TKE_CLUSTER_OS_TYPE_GENERAL}
59+
var TKE_CLUSTER_OS_TYPES = []string{TKE_CLUSTER_OS_TYPE_GENERAL}
6060

6161
const (
6262
TkeInternetStatusCreating = "Creating"

tencentcloud/resource_tc_instance.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,10 @@ func resourceTencentCloudInstance() *schema.Resource {
276276
Description: "Data disk type. For more information about limits on different data disk types, see [Storage Overview](https://intl.cloud.tencent.com/document/product/213/4952). Valid values: `LOCAL_BASIC`: local disk, `LOCAL_SSD`: local SSD disk, `CLOUD_BASIC`: HDD cloud disk, `CLOUD_PREMIUM`: Premium Cloud Storage, `CLOUD_SSD`: SSD, `CLOUD_HSSD`: Enhanced SSD. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated.",
277277
},
278278
"data_disk_size": {
279-
Type: schema.TypeInt,
280-
Required: true,
281-
ForceNew: true,
282-
ValidateFunc: validateIntegerInRange(10, 16000),
283-
Description: "Size of the data disk, and unit is GB. If disk type is `CLOUD_SSD`, the size range is [100, 16000], and the others are [10-16000].",
279+
Type: schema.TypeInt,
280+
Required: true,
281+
ForceNew: true,
282+
Description: "Size of the data disk, and unit is GB. If disk type is `CLOUD_SSD`, the size range is [100, 16000], and the others are [10-16000].",
284283
},
285284
"data_disk_snapshot_id": {
286285
Type: schema.TypeString,

tencentcloud/resource_tc_kubernetes_cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
498498
Default: TKE_CLUSTER_OS_TYPE_GENERAL,
499499
ValidateFunc: validateAllowedStringValue(TKE_CLUSTER_OS_TYPES),
500500
Description: "Image type of the cluster os, the available values include: '" + strings.Join(TKE_CLUSTER_OS_TYPES, "','") +
501-
"'. Default is '" + TKE_CLUSTER_OS_TYPE_GENERAL,
501+
"'. Default is '" + TKE_CLUSTER_OS_TYPE_GENERAL + ".",
502502
},
503503
"container_runtime": {
504504
Type: schema.TypeString,

tencentcloud/resource_tc_kubernetes_scale_worker.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ import (
107107
"fmt"
108108
"log"
109109
"strings"
110+
"time"
110111

111112
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
112113
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -322,7 +323,9 @@ func resourceTencentCloudTkeScaleWorkerCreate(d *schema.ResourceData, meta inter
322323

323324
d.SetId(id)
324325

325-
return nil
326+
//wait for LANIP
327+
time.Sleep(readRetryTimeout)
328+
return resourceTencentCloudTkeScaleWorkerRead(d, meta)
326329
}
327330

328331
func resourceTencentCloudTkeScaleWorkerRead(d *schema.ResourceData, meta interface{}) error {

website/docs/r/kubernetes_cluster.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ The following arguments are supported:
220220
* `cluster_max_pod_num` - (Optional, ForceNew) The maximum number of Pods per node in the cluster. Default is 256. Must be a multiple of 16 and large than 32.
221221
* `cluster_max_service_num` - (Optional, ForceNew) The maximum number of services in the cluster. Default is 256. Must be a multiple of 16.
222222
* `cluster_name` - (Optional) Name of the cluster.
223-
* `cluster_os_type` - (Optional, ForceNew) Image type of the cluster os, Default is 'GENERAL'.
223+
* `cluster_os_type` - (Optional, ForceNew) Image type of the cluster os, the available values include: 'GENERAL'. Default is 'GENERAL.
224224
* `cluster_os` - (Optional, ForceNew) Operating system of the cluster, the available values include: 'centos7.2x86_64','centos7.6x86_64','ubuntu16.04.1 LTSx86_64','ubuntu18.04.1 LTSx86_64','tlinux2.4x86_64'. Default is 'ubuntu16.04.1 LTSx86_64'.
225225
* `cluster_version` - (Optional) Version of the cluster, Default is '1.10.5'.
226226
* `container_runtime` - (Optional, ForceNew) Runtime type of the cluster, the available values include: 'docker' and 'containerd'. Default is 'docker'.

0 commit comments

Comments
 (0)