Merge pull request #612 from gailwang/master

fix bugs

Author: oliverpei

tencentcloud/resource_tc_clb_instance.go

@@ -611,7 +611,14 @@ func checkSameName(name string, meta interface{}) (flag bool, errRet error) {
 			return retryError(e)
 		}
 		if len(clbs) > 0 {
-			flag = true
+			//this describe function is a fuzzy query
+			// so take a further check
+			for _, clb := range clbs {
+				if *clb.LoadBalancerName == name {
+					flag = true
+					return nil
+				}
+			}
 		}
 		return nil
 	})

tencentcloud/resource_tc_kubernetes_node_pool.go

@@ -706,9 +706,12 @@ func resourceKubernetesNodePoolCreate(d *schema.ResourceData, meta interface{})
 		iAdvanced.Unschedulable = helper.Int64(int64(temp.(int)))
 	}
 
+	nodeOs := d.Get("node_os").(string)
+	nodeOsType := d.Get("node_os_type").(string)
+
 	service := TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
 
-	nodePoolId, err := service.CreateClusterNodePool(ctx, clusterId, name, groupParaStr, configParaStr, enableAutoScale, labels, taints, iAdvanced)
+	nodePoolId, err := service.CreateClusterNodePool(ctx, clusterId, name, groupParaStr, configParaStr, enableAutoScale, nodeOs, nodeOsType, labels, taints, iAdvanced)
 	if err != nil {
 		return err
 	}

tencentcloud/service_tencentcloud_tke.go

@@ -947,7 +947,7 @@ func (me *TkeService) ModifyClusterAsGroupAttribute(ctx context.Context, id, asG
 	return
 }
 
-func (me *TkeService) CreateClusterNodePool(ctx context.Context, clusterId, name, groupPara, configPara string, enableAutoScale bool, labels []*tke.Label, taints []*tke.Taint, iAdvanced tke.InstanceAdvancedSettings) (asGroupId string, errRet error) {
+func (me *TkeService) CreateClusterNodePool(ctx context.Context, clusterId, name, groupPara, configPara string, enableAutoScale bool, nodeOs string, nodeOsType string, labels []*tke.Label, taints []*tke.Taint, iAdvanced tke.InstanceAdvancedSettings) (asGroupId string, errRet error) {
 	logId := getLogId(ctx)
 	request := tke.NewCreateClusterNodePoolRequest()
 
@@ -962,6 +962,8 @@ func (me *TkeService) CreateClusterNodePool(ctx context.Context, clusterId, name
 	request.LaunchConfigurePara = &configPara
 	request.InstanceAdvancedSettings = &iAdvanced
 	request.EnableAutoscale = &enableAutoScale
+	request.NodePoolOs = &nodeOs
+	request.OsCustomizeType = &nodeOsType
 
 	if len(labels) > 0 {
 		request.Labels = labels