Merge branch 'master' into feature/tke_global_config

Author: gailwang

CHANGELOG.md

@@ -1,9 +1,15 @@
-## 1.55.1 (Unreleased)
+## 1.55.2 (Unreleased)
 
 ENHANCEMENTS:
 
 * Resource: `tencentcloud_kubernetes_cluster` add `node_pool_global_config` to support node pool global config setting.
 
+## 1.55.1 (March 26, 2021)
+
+ENHANCEMENTS:
+
+* Resource: `tencentcloud_tcr_vpc_attachment` add more time for retry.
+
 ## 1.55.0 (March 26, 2021)
 
 FEATURES:

tencentcloud/connectivity/transport.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-const ReqClient = "Terraform-v1.55.0"
+const ReqClient = "Terraform-v1.55.1"
 
 type LogRoundTripper struct {
 }

tencentcloud/resource_tc_eip.go

@@ -151,7 +151,7 @@ func resourceTencentCloudEipCreate(d *schema.ResourceData, meta interface{}) err
 			logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 
 		if len(response.Response.AddressSet) < 1 {
-			return resource.NonRetryableError(fmt.Errorf("eip id is nil"))
+			return resource.RetryableError(fmt.Errorf("eip id is nil"))
 		}
 		eipId = *response.Response.AddressSet[0]
 		return nil

tencentcloud/resource_tc_tcr_vpc_attachment.go

@@ -314,7 +314,7 @@ func resourceTencentCLoudTcrVpcAttachmentDelete(d *schema.ResourceData, meta int
 }
 
 func WaitForAccessIpExists(ctx context.Context, tcrService TCRService, instanceId string, vpcId string, subnetId string) (accessIp string, errRet error) {
-	errRet = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+	errRet = resource.Retry(3*readRetryTimeout, func() *resource.RetryError {
 		result, has, inErr := tcrService.DescribeTCRVPCAttachmentById(ctx, instanceId, vpcId, subnetId)
 		if inErr != nil {
 			return retryError(inErr)