add

Author: SevenEarth

tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go

@@ -6,7 +6,7 @@ Provide a resource to create an auto scaling group for kubernetes cluster.
 
 ~> **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`.
 
-~> **NOTE:**  There are two parameters `wait_node_ready` and `scale_tolerance` to ensure better management of node pool scaling operations. If this parameter is set, when creating resources, if the set criteria are not met, the resources will be marked as `tainted`.
+~> **NOTE:**  There are two parameters `wait_node_ready` and `scale_tolerance` to ensure better management of node pool scaling operations. If this parameter is set when creating a resource, the resource will be marked as `tainted` if the set conditions are not met.
 
 Example Usage
 
@@ -145,7 +145,7 @@ resource "tencentcloud_kubernetes_node_pool" "example" {
 }
 ```
 
-Set `wait_node_ready` and `scale_tolerance`
+Wait for all scaling nodes to be ready with wait_node_ready and scale_tolerance parameters.
 
 ```hcl
 resource "tencentcloud_kubernetes_node_pool" "example" {

tencentcloud/services/tke/resource_tc_kubernetes_node_pool.md

@@ -1438,7 +1438,7 @@ func waitNodePoolInitializing(ctx context.Context, clusterId, nodePoolId string)
 		nodePoolDetailrequest := tke.NewDescribeClusterNodePoolDetailRequest()
 		nodePoolDetailrequest.ClusterId = common.StringPtr(clusterId)
 		nodePoolDetailrequest.NodePoolId = common.StringPtr(nodePoolId)
-		err = resource.Retry(1*tccommon.ReadRetryTimeout, func() *resource.RetryError {
+		err = resource.Retry(10*tccommon.ReadRetryTimeout, func() *resource.RetryError {
 			result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().DescribeClusterNodePoolDetailWithContext(ctx, nodePoolDetailrequest)
 			if e != nil {
 				return tccommon.RetryError(e)
@@ -1501,8 +1501,10 @@ func waitNodePoolInitializing(ctx context.Context, clusterId, nodePoolId string)
 				})
 
 				if err != nil {
-					return fmt.Errorf("Node pool scaling failed, Reason: %s\nPlease check your resource inventory, Or adjust `desired_capacity`, `scale_tolerance` and `instance_type`, Then try again.", errFmt)
+					return fmt.Errorf("Describe auto scaling activities failed: %s", err)
 				}
+
+				return fmt.Errorf("Node pool scaling failed, Reason: %s\nPlease check your resource inventory, Or adjust `desired_capacity`, `scale_tolerance` and `instance_type`, Then try again.", errFmt)
 			} else {
 				return fmt.Errorf("Node pool scaling failed, Desired value: %d, Actual value: %d, Scale tolerance: %d%%\nPlease check your resource inventory, Or adjust `desired_capacity`, `scale_tolerance` and `instance_type`, Then try again.", desiredCapacity, currentNormal, scaleTolerance)
 			}

tencentcloud/services/tke/resource_tc_kubernetes_node_pool_extension.go

@@ -17,7 +17,7 @@ Provide a resource to create an auto scaling group for kubernetes cluster.
 
 ~> **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`.
 
-~> **NOTE:**  There are two parameters `wait_node_ready` and `scale_tolerance` to ensure better management of node pool scaling operations. If this parameter is set, when creating resources, if the set criteria are not met, the resources will be marked as `tainted`.
+~> **NOTE:**  There are two parameters `wait_node_ready` and `scale_tolerance` to ensure better management of node pool scaling operations. If this parameter is set when creating a resource, the resource will be marked as `tainted` if the set conditions are not met.
 
 ## Example Usage
 
@@ -156,7 +156,7 @@ resource "tencentcloud_kubernetes_node_pool" "example" {
 }
 ```
 
-
+### Wait for all scaling nodes to be ready with wait_node_ready and scale_tolerance parameters.
 
 ```hcl
 resource "tencentcloud_kubernetes_node_pool" "example" {
@@ -254,7 +254,7 @@ The following arguments are supported:
 * `taints` - (Optional, List) Taints of kubernetes node pool created nodes.
 * `termination_policies` - (Optional, List: [`String`]) Policy of scaling group termination. Available values: `["OLDEST_INSTANCE"]`, `["NEWEST_INSTANCE"]`.
 * `unschedulable` - (Optional, Int, ForceNew) Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.
-* `wait_node_ready` - (Optional, Bool) Whether to wait for all expansion resources to be ready. Default is false. Only can be set if `enable_auto_scale` is `false`.
+* `wait_node_ready` - (Optional, Bool) Whether to wait for all desired nodes to be ready. Default is false. Only can be set if `enable_auto_scale` is `false`.
 * `zones` - (Optional, List: [`String`]) List of auto scaling group available zones, for Basic network it is required.
 
 The `annotations` object supports the following: