tencentcloudstack · oliverpei · Dec 28, 2020 · Nov 12, 2020 · Nov 13, 2020 · Nov 13, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
-## 1.51.2 (Unreleased)
+## 1.52.0 (Unreleased)
+
+FEATURES:
+
+* **New Resource**: `tencentcloud_kubernetes_node_pool` to support node management.
+
+DEPRECATED:
+
+* Resource: `tencentcloud_kubernetes_as_scaling_group` replaced by `tencentcloud_kubernetes_node_pool`.
+
+
 ## 1.51.1 (December 22, 2020)
 
 ENHANCEMENTS:

diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/tencentcloud/tencentcloud-sdk-go v1.0.67
+	github.com/tencentcloud/tencentcloud-sdk-go v1.0.76
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

diff --git a/go.sum b/go.sum
@@ -441,8 +441,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.67 h1:fKSwJ7hrvHTxr33EcmrbKcavYJ/U2zNIH8Lvsj2FNTE=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.67/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.76 h1:fVggxeCzlYcIliDjPKC4yGpbfQibWY6HmT9dbS7BKf8=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.76/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

diff --git a/tencentcloud/provider.go b/tencentcloud/provider.go
@@ -307,6 +307,7 @@ Tencent Kubernetes Engine(TKE)
     tencentcloud_kubernetes_scale_worker
     tencentcloud_kubernetes_as_scaling_group
     tencentcloud_kubernetes_cluster_attachment
+	tencentcloud_kubernetes_node_pool
 
 MongoDB
   Data Source
@@ -816,6 +817,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_kubernetes_as_scaling_group":             ResourceTencentCloudKubernetesAsScalingGroup(),
 			"tencentcloud_kubernetes_scale_worker":                 resourceTencentCloudTkeScaleWorker(),
 			"tencentcloud_kubernetes_cluster_attachment":           resourceTencentCloudTkeClusterAttachment(),
+			"tencentcloud_kubernetes_node_pool":                    ResourceTencentCloudKubernetesNodePool(),
 			"tencentcloud_mysql_backup_policy":                     resourceTencentCloudMysqlBackupPolicy(),
 			"tencentcloud_mysql_account":                           resourceTencentCloudMysqlAccount(),
 			"tencentcloud_mysql_account_privilege":                 resourceTencentCloudMysqlAccountPrivilege(),

diff --git a/tencentcloud/resource_tc_kubernetes_as_scaling_group.go b/tencentcloud/resource_tc_kubernetes_as_scaling_group.go
@@ -1,6 +1,6 @@
 /*
 Provide a resource to create an auto scaling group for kubernetes cluster.
-
+~> **NOTE:**  It has been deprecated and replaced by `tencentcloud_cluster_node_pool`.
 ~> **NOTE:** To use the custom Kubernetes component startup parameter function (parameter `extra_args`), you need to submit a ticket for application.
 
 Example Usage

diff --git a/tencentcloud/resource_tc_kubernetes_cluster.go b/tencentcloud/resource_tc_kubernetes_cluster.go
@@ -2,6 +2,7 @@
 Provide a resource to create a kubernetes cluster.
 
 ~> **NOTE:** To use the custom Kubernetes component startup parameter function (parameter `extra_args`), you need to submit a ticket for application.
+~> **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`.
 
 Example Usage
 
@@ -500,7 +501,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			Optional:     true,
 			Default:      TKE_DEPLOY_TYPE_MANAGED,
 			ValidateFunc: validateAllowedStringValue(TKE_DEPLOY_TYPES),
-			Description:  "Deployment type of the cluster, the available values include: 'MANAGED_CLUSTER' and 'INDEPENDENT_CLUSTER', Default is 'MANAGED_CLUSTER'.",
+			Description:  "Deployment type of the cluster, the available values include: 'MANAGED_CLUSTER' and 'INDEPENDENT_CLUSTER'. Default is 'MANAGED_CLUSTER'.",
 		},
 		"cluster_version": {
 			Type:        schema.TypeString,

diff --git a/tencentcloud/resource_tc_kubernetes_cluster_attachment_test.go b/tencentcloud/resource_tc_kubernetes_cluster_attachment_test.go
@@ -214,6 +214,10 @@ resource "tencentcloud_kubernetes_cluster_attachment" "test_attach" {
     "test1" = "test1",
     "test2" = "test2",
   }
+
+  extra_args = [
+ 	"root-dir=/var/lib/kubelet"
+  ]
 }
 `
 }