Skip to content

Commit 0db13ac

Browse files
committed
add kms resource and data source to CHANGELOG.md and format some code
1 parent dad6f28 commit 0db13ac

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
## 1.53.8 (Unreleased)
1+
## 1.54.1 (Unreleased)
2+
## 1.54.0 (March 10, 2021)
3+
4+
FEATURES:
5+
6+
* **New Resource**: `tencentcloud_kms_key`
7+
* **New Resource**: `tencentcloud_kms_external_key`
8+
* **New Data Source**: `tencentcloud_kms_key`
9+
210
## 1.53.7 (March 09, 2021)
311

412
ENHANCEMENTS:

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_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,

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)