Skip to content

Commit b45a485

Browse files
authored
Add TKE node pool resource (#572)
1 parent 111f447 commit b45a485

40 files changed

+7833
-1234
lines changed

CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
## 1.51.2 (Unreleased)
1+
## 1.52.0 (Unreleased)
2+
3+
FEATURES:
4+
5+
* **New Resource**: `tencentcloud_kubernetes_node_pool` to support node management.
6+
7+
DEPRECATED:
8+
9+
* Resource: `tencentcloud_kubernetes_as_scaling_group` replaced by `tencentcloud_kubernetes_node_pool`.
10+
11+
212
## 1.51.1 (December 22, 2020)
313

414
ENHANCEMENTS:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/mattn/go-colorable v0.1.6 // indirect
1616
github.com/mitchellh/go-homedir v1.1.0
1717
github.com/pkg/errors v0.9.1
18-
github.com/tencentcloud/tencentcloud-sdk-go v1.0.67
18+
github.com/tencentcloud/tencentcloud-sdk-go v1.0.76
1919
github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
2020
github.com/zclconf/go-cty v1.4.2 // indirect
2121
golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
441441
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
442442
github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
443443
github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
444-
github.com/tencentcloud/tencentcloud-sdk-go v1.0.67 h1:fKSwJ7hrvHTxr33EcmrbKcavYJ/U2zNIH8Lvsj2FNTE=
445-
github.com/tencentcloud/tencentcloud-sdk-go v1.0.67/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
444+
github.com/tencentcloud/tencentcloud-sdk-go v1.0.76 h1:fVggxeCzlYcIliDjPKC4yGpbfQibWY6HmT9dbS7BKf8=
445+
github.com/tencentcloud/tencentcloud-sdk-go v1.0.76/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
446446
github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
447447
github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
448448
github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

tencentcloud/provider.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ Tencent Kubernetes Engine(TKE)
307307
tencentcloud_kubernetes_scale_worker
308308
tencentcloud_kubernetes_as_scaling_group
309309
tencentcloud_kubernetes_cluster_attachment
310+
tencentcloud_kubernetes_node_pool
310311
311312
MongoDB
312313
Data Source
@@ -816,6 +817,7 @@ func Provider() terraform.ResourceProvider {
816817
"tencentcloud_kubernetes_as_scaling_group": ResourceTencentCloudKubernetesAsScalingGroup(),
817818
"tencentcloud_kubernetes_scale_worker": resourceTencentCloudTkeScaleWorker(),
818819
"tencentcloud_kubernetes_cluster_attachment": resourceTencentCloudTkeClusterAttachment(),
820+
"tencentcloud_kubernetes_node_pool": ResourceTencentCloudKubernetesNodePool(),
819821
"tencentcloud_mysql_backup_policy": resourceTencentCloudMysqlBackupPolicy(),
820822
"tencentcloud_mysql_account": resourceTencentCloudMysqlAccount(),
821823
"tencentcloud_mysql_account_privilege": resourceTencentCloudMysqlAccountPrivilege(),

tencentcloud/resource_tc_kubernetes_as_scaling_group.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Provide a resource to create an auto scaling group for kubernetes cluster.
3-
3+
~> **NOTE:** It has been deprecated and replaced by `tencentcloud_cluster_node_pool`.
44
~> **NOTE:** To use the custom Kubernetes component startup parameter function (parameter `extra_args`), you need to submit a ticket for application.
55
66
Example Usage

tencentcloud/resource_tc_kubernetes_cluster.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Provide a resource to create a kubernetes cluster.
33
44
~> **NOTE:** To use the custom Kubernetes component startup parameter function (parameter `extra_args`), you need to submit a ticket for application.
5+
~> **NOTE:** We recommend the usage of one cluster without worker config + node pool to manage cluster and nodes. It's 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`.
56
67
Example Usage
78
@@ -500,7 +501,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
500501
Optional: true,
501502
Default: TKE_DEPLOY_TYPE_MANAGED,
502503
ValidateFunc: validateAllowedStringValue(TKE_DEPLOY_TYPES),
503-
Description: "Deployment type of the cluster, the available values include: 'MANAGED_CLUSTER' and 'INDEPENDENT_CLUSTER', Default is 'MANAGED_CLUSTER'.",
504+
Description: "Deployment type of the cluster, the available values include: 'MANAGED_CLUSTER' and 'INDEPENDENT_CLUSTER'. Default is 'MANAGED_CLUSTER'.",
504505
},
505506
"cluster_version": {
506507
Type: schema.TypeString,

tencentcloud/resource_tc_kubernetes_cluster_attachment_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,10 @@ resource "tencentcloud_kubernetes_cluster_attachment" "test_attach" {
214214
"test1" = "test1",
215215
"test2" = "test2",
216216
}
217+
218+
extra_args = [
219+
"root-dir=/var/lib/kubelet"
220+
]
217221
}
218222
`
219223
}

0 commit comments

Comments
 (0)