add

Author: SevenEarth

tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go

@@ -6,6 +6,8 @@ import (
 	"log"
 	"strings"
 
+	tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http"
+
 	as "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419"
 	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 
@@ -616,48 +618,94 @@ func resourceTencentCloudKubernetesNodePoolUpdateOnStart(ctx context.Context) er
 		"labels",
 		"tags",
 	) {
-		request := tke.NewModifyClusterNodePoolRequest()
-		request.ClusterId = &clusterId
-		request.NodePoolId = &nodePoolId
+		var body map[string]interface{}
+		nodeOs := d.Get("node_os").(string)
+		nodeOsType := d.Get("node_os_type").(string)
+		//自定镜像不能指定节点操作系统类型
+		if strings.Contains(nodeOs, "img-") {
+			nodeOsType = ""
+		}
 
 		labels := GetTkeLabels(d, "labels")
-		tags := helper.GetTags(d, "tags")
-		if len(labels) > 0 {
-			request.Labels = labels
+		body = map[string]interface{}{
+			"ClusterId":       clusterId,
+			"NodePoolId":      nodePoolId,
+			"OsName":          nodeOs,
+			"OsCustomizeType": nodeOsType,
+			"Labels":          labels,
 		}
+
+		tags := helper.GetTags(d, "tags")
 		if len(tags) > 0 {
+			var tmpTags []*tke.Tag
 			for k, v := range tags {
 				key := k
 				val := v
-				request.Tags = append(request.Tags, &tke.Tag{
+				tmpTags = append(tmpTags, &tke.Tag{
 					Key:   &key,
 					Value: &val,
 				})
 			}
+
+			body["Tags"] = tmpTags
 		}
 
-		nodeOs := d.Get("node_os").(string)
-		nodeOsType := d.Get("node_os_type").(string)
-		//自定镜像不能指定节点操作系统类型
-		if strings.Contains(nodeOs, "img-") {
-			nodeOsType = ""
+		client := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseOmitNilClient("tke")
+		request := tchttp.NewCommonRequest("tke", "2018-05-25", "ModifyClusterNodePool")
+		err := request.SetActionParameters(body)
+		if err != nil {
+			return err
 		}
-		request.OsName = &nodeOs
-		request.OsCustomizeType = &nodeOsType
-		err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
-			result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterNodePool(request)
-			if e != nil {
-				return tccommon.RetryError(e)
-			} else {
-				log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
-			}
-			return nil
-		})
+
+		response := tchttp.NewCommonResponse()
+		err = client.Send(request, response)
 		if err != nil {
-			log.Printf("[CRITAL]%s update kubernetes node pool failed, reason:%+v", logId, err)
+			fmt.Printf("update kubernetes node pool taints failed: %v \n", err)
 			return err
 		}
 
+		//request := tke.NewModifyClusterNodePoolRequest()
+		//request.ClusterId = &clusterId
+		//request.NodePoolId = &nodePoolId
+		//nodeOs := d.Get("node_os").(string)
+		//nodeOsType := d.Get("node_os_type").(string)
+		////自定镜像不能指定节点操作系统类型
+		//if strings.Contains(nodeOs, "img-") {
+		//	nodeOsType = ""
+		//}
+		//request.OsName = &nodeOs
+		//request.OsCustomizeType = &nodeOsType
+		//
+		//labels := GetTkeLabels(d, "labels")
+		//tags := helper.GetTags(d, "tags")
+		//if len(labels) > 0 {
+		//	request.Labels = labels
+		//}
+		//if len(tags) > 0 {
+		//	for k, v := range tags {
+		//		key := k
+		//		val := v
+		//		request.Tags = append(request.Tags, &tke.Tag{
+		//			Key:   &key,
+		//			Value: &val,
+		//		})
+		//	}
+		//}
+		//
+		//err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		//	result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterNodePool(request)
+		//	if e != nil {
+		//		return tccommon.RetryError(e)
+		//	} else {
+		//		log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		//	}
+		//	return nil
+		//})
+		//if err != nil {
+		//	log.Printf("[CRITAL]%s update kubernetes node pool failed, reason:%+v", logId, err)
+		//	return err
+		//}
+
 		// todo wait for status ok
 		err = resource.Retry(5*tccommon.ReadRetryTimeout, func() *resource.RetryError {
 			nodePool, _, errRet := service.DescribeNodePool(ctx, clusterId, nodePoolId)
@@ -669,6 +717,7 @@ func resourceTencentCloudKubernetesNodePoolUpdateOnStart(ctx context.Context) er
 			}
 			return resource.RetryableError(fmt.Errorf("node pool status is %s, retry...", *nodePool.LifeState))
 		})
+
 		if err != nil {
 			return err
 		}