feat(tke): add taints para

Author: andrew-tx

tencentcloud/services/apigateway/data_source_tc_api_gateway_api_app_api.go

@@ -95,8 +95,8 @@ func DataSourceTencentCloudApiGatewayApiAppApi() *schema.Resource {
 							Description: "API authentication type. Possible values are SECRET (key pair authentication), NONE (authentication-free), and OAUTH.",
 						},
 						"api_business_type": {
-							Type:        schema.TypeString,
-							Computed:    true,
+							Type:     schema.TypeString,
+							Computed: true,
 							Description: "Type of OAUTH API. Possible values are NORMAL (Business API), OAUTH (Authorization API).",
 						},
 						"auth_relation_api_id": {

tencentcloud/services/cfs/data_source_tc_cfs_available_zone.go

@@ -71,8 +71,8 @@ func DataSourceTencentCloudCfsAvailableZone() *schema.Resource {
 													Elem: &schema.Resource{
 														Schema: map[string]*schema.Schema{
 															"sale_status": {
-																Type:        schema.TypeString,
-																Computed:    true,
+																Type:     schema.TypeString,
+																Computed: true,
 																Description: "	Sale status. Valid values: sale_out (sold out), saling (purchasable), no_saling (non-purchasable).",
 															},
 															"protocol": {

tencentcloud/services/cos/data_source_tc_cos_bucket_inventorys.go

@@ -78,8 +78,8 @@ func DataSourceTencentCloudCosBucketInventorys() *schema.Resource {
 							},
 						},
 						"optional_fields": {
-							Type:        schema.TypeList,
-							Optional:    true,
+							Type:     schema.TypeList,
+							Optional: true,
 							Description: "Analysis items to include in the inventory result	.",
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{

tencentcloud/services/cos/resource_tc_cos_bucket_inventory.go

@@ -83,9 +83,9 @@ func ResourceTencentCloudCosBucketInventory() *schema.Resource {
 				},
 			},
 			"optional_fields": {
-				Type:        schema.TypeList,
-				MaxItems:    1,
-				Optional:    true,
+				Type:     schema.TypeList,
+				MaxItems: 1,
+				Optional: true,
 				Description: "Analysis items to include in the inventory result	.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{

tencentcloud/services/monitor/data_source_tc_monitor_alarm_policy.go

@@ -426,8 +426,8 @@ func DataSourceTencentCloudMonitorAlarmPolicy() *schema.Resource {
 													Description: "Statistical period in seconds. The valid values can be queried via DescribeAlarmMetricsNote: this field may return null, indicating that no valid value is obtained.",
 												},
 												"operator": {
-													Type:        schema.TypeString,
-													Computed:    true,
+													Type:     schema.TypeString,
+													Computed: true,
 													Description: "Statistical period in seconds. The valid values can be queried via DescribeAlarmMetrics.Note: this field may return null, indicating that no valid value is obtained.Operator	String	No	Operatorintelligent = intelligent detection without thresholdeq = equal toge = greater than or equal togt = greater thanle = less than or equal tolt = less thanne = not equal today_increase = day-on-day increaseday_decrease = day-on-day decreaseday_wave = day-on-day fluctuationweek_increase = week-on-week increaseweek_decrease = week-on-week decreaseweek_wave = week-on-week fluctuationcycle_increase = cyclical increasecycle_decrease = cyclical decreasecycle_wave = cyclical fluctuationre = regex matchThe valid values can be queried via DescribeAlarmMetrics.Note: this field may return null, indicating that no valid value is obtained.",
 												},
 												"value": {

tencentcloud/services/mps/data_source_tc_mps_schedules.go

@@ -118,16 +118,16 @@ func DataSourceTencentCloudMpsSchedules() *schema.Resource {
 													Description: "The region of the AWS S3 bucket.",
 												},
 												"dir": {
-													Type:        schema.TypeString,
-													Computed:    true,
+													Type:     schema.TypeString,
+													Computed: true,
 													Description: "The bucket directory bound. It must be an absolute path that starts and ends with `/`, such as `/movie/201907/`. If you do not specify this, the root directory will be bound.	.",
 												},
 												"formats": {
 													Type: schema.TypeSet,
 													Elem: &schema.Schema{
 														Type: schema.TypeString,
 													},
-													Computed:    true,
+													Computed: true,
 													Description: "The file formats that will trigger the scheme, such as [mp4, flv, mov]. If you do not specify this, the upload of files in any format will trigger the scheme.	.",
 												},
 												"s3_secret_id": {

tencentcloud/services/mps/resource_tc_mps_schedule.go

@@ -92,16 +92,16 @@ func ResourceTencentCloudMpsSchedule() *schema.Resource {
 										Description: "The region of the AWS S3 bucket.",
 									},
 									"dir": {
-										Type:        schema.TypeString,
-										Optional:    true,
+										Type:     schema.TypeString,
+										Optional: true,
 										Description: "The bucket directory bound. It must be an absolute path that starts and ends with `/`, such as `/movie/201907/`. If you do not specify this, the root directory will be bound.	.",
 									},
 									"formats": {
 										Type: schema.TypeSet,
 										Elem: &schema.Schema{
 											Type: schema.TypeString,
 										},
-										Optional:    true,
+										Optional: true,
 										Description: "The file formats that will trigger the scheme, such as [mp4, flv, mov]. If you do not specify this, the upload of files in any format will trigger the scheme.	.",
 									},
 									"s3_secret_id": {

tencentcloud/services/tke/extension_tke.go

@@ -3,7 +3,6 @@ package tke
 import (
 	tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
 
-	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 	svccvm "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/cvm"
 )
 
@@ -158,145 +157,3 @@ var tkeNativeNodePoolAnnotationsMap = map[string]string{
 	"node.tke.cloud.tencent.com/security-agent":            "node.tke.cloud.tencent.com/security-agent",
 	"node.tke.cloud.tencent.com/security-groups-spread":    "node.tke.cloud.tencent.com/security-groups-spread",
 }
-
-func tkeGetInstanceAdvancedPara(dMap map[string]interface{}, meta interface{}) (setting tke.InstanceAdvancedSettings) {
-	setting = tke.InstanceAdvancedSettings{}
-	if v, ok := dMap["mount_target"]; ok {
-		setting.MountTarget = helper.String(v.(string))
-	}
-
-	if v, ok := dMap["data_disk"]; ok {
-		dataDisks := v.([]interface{})
-		setting.DataDisks = make([]*tke.DataDisk, len(dataDisks))
-		for i, d := range dataDisks {
-			value := d.(map[string]interface{})
-			var diskType, fileSystem, mountTarget, diskPartition string
-			if v, ok := value["disk_type"].(string); ok {
-				diskType = v
-			}
-			if v, ok := value["file_system"].(string); ok {
-				fileSystem = v
-			}
-			if v, ok := value["mount_target"].(string); ok {
-				mountTarget = v
-			}
-			if v, ok := value["disk_partition"].(string); ok {
-				diskPartition = v
-			}
-
-			diskSize := int64(value["disk_size"].(int))
-			autoFormatAndMount := value["auto_format_and_mount"].(bool)
-			dataDisk := &tke.DataDisk{
-				DiskType:           &diskType,
-				FileSystem:         &fileSystem,
-				AutoFormatAndMount: &autoFormatAndMount,
-				MountTarget:        &mountTarget,
-				DiskPartition:      &diskPartition,
-			}
-			if diskSize > 0 {
-				dataDisk.DiskSize = &diskSize
-			}
-			setting.DataDisks[i] = dataDisk
-		}
-	}
-	if v, ok := dMap["is_schedule"]; ok {
-		setting.Unschedulable = helper.BoolToInt64Ptr(!v.(bool))
-	}
-
-	if v, ok := dMap["user_data"]; ok {
-		setting.UserScript = helper.String(v.(string))
-	}
-
-	if v, ok := dMap["pre_start_user_script"]; ok {
-		setting.PreStartUserScript = helper.String(v.(string))
-	}
-
-	if v, ok := dMap["taints"]; ok {
-		taints := v.([]interface{})
-		setting.Taints = make([]*tke.Taint, len(taints))
-		for i, d := range taints {
-			taint := d.(map[string]interface{})
-			var value, key, effect string
-			if v, ok := taint["key"].(string); ok {
-				key = v
-			}
-			if v, ok := taint["value"].(string); ok {
-				value = v
-			}
-			if v, ok := taint["effect"].(string); ok {
-				effect = v
-			}
-			taintItem := &tke.Taint{
-				Key:    &key,
-				Value:  &value,
-				Effect: &effect,
-			}
-			setting.Taints[i] = taintItem
-		}
-	}
-
-	if v, ok := dMap["docker_graph_path"]; ok {
-		setting.DockerGraphPath = helper.String(v.(string))
-	}
-
-	if v, ok := dMap["desired_pod_num"]; ok {
-		setting.DesiredPodNumber = helper.Int64(int64(v.(int)))
-	}
-
-	if temp, ok := dMap["extra_args"]; ok {
-		extraArgs := helper.InterfacesStrings(temp.([]interface{}))
-		clusterExtraArgs := tke.InstanceExtraArgs{}
-		clusterExtraArgs.Kubelet = make([]*string, 0)
-		for i := range extraArgs {
-			clusterExtraArgs.Kubelet = append(clusterExtraArgs.Kubelet, &extraArgs[i])
-		}
-		setting.ExtraArgs = &clusterExtraArgs
-	}
-
-	// get gpu_args
-	if v, ok := dMap["gpu_args"]; ok && len(v.([]interface{})) > 0 {
-		gpuArgs := v.([]interface{})[0].(map[string]interface{})
-
-		var (
-			migEnable    = gpuArgs["mig_enable"].(bool)
-			driver       = gpuArgs["driver"].(map[string]interface{})
-			cuda         = gpuArgs["cuda"].(map[string]interface{})
-			cudnn        = gpuArgs["cudnn"].(map[string]interface{})
-			customDriver = gpuArgs["custom_driver"].(map[string]interface{})
-		)
-		tkeGpuArgs := tke.GPUArgs{}
-		tkeGpuArgs.MIGEnable = &migEnable
-		if len(driver) > 0 {
-			tkeGpuArgs.Driver = &tke.DriverVersion{
-				Version: helper.String(driver["version"].(string)),
-				Name:    helper.String(driver["name"].(string)),
-			}
-		}
-		if len(cuda) > 0 {
-			tkeGpuArgs.CUDA = &tke.DriverVersion{
-				Version: helper.String(cuda["version"].(string)),
-				Name:    helper.String(cuda["name"].(string)),
-			}
-		}
-		if len(cudnn) > 0 {
-			tkeGpuArgs.CUDNN = &tke.CUDNN{
-				Version: helper.String(cudnn["version"].(string)),
-				Name:    helper.String(cudnn["name"].(string)),
-			}
-			if cudnn["doc_name"] != nil {
-				tkeGpuArgs.CUDNN.DocName = helper.String(cudnn["doc_name"].(string))
-			}
-			if cudnn["dev_name"] != nil {
-				tkeGpuArgs.CUDNN.DevName = helper.String(cudnn["dev_name"].(string))
-			}
-		}
-		if len(customDriver) > 0 {
-			tkeGpuArgs.CustomDriver = &tke.CustomDriver{
-				Address: helper.String(customDriver["address"].(string)),
-			}
-		}
-		setting.GPUArgs = &tkeGpuArgs
-	}
-
-	return setting
-}

tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment.go

@@ -732,3 +732,145 @@ func resourceTencentCloudKubernetesClusterAttachmentDelete(d *schema.ResourceDat
 	_ = response
 	return nil
 }
+
+func tkeGetInstanceAdvancedPara(dMap map[string]interface{}, meta interface{}) (setting tke.InstanceAdvancedSettings) {
+	setting = tke.InstanceAdvancedSettings{}
+	if v, ok := dMap["mount_target"]; ok {
+		setting.MountTarget = helper.String(v.(string))
+	}
+
+	if v, ok := dMap["data_disk"]; ok {
+		dataDisks := v.([]interface{})
+		setting.DataDisks = make([]*tke.DataDisk, len(dataDisks))
+		for i, d := range dataDisks {
+			value := d.(map[string]interface{})
+			var diskType, fileSystem, mountTarget, diskPartition string
+			if v, ok := value["disk_type"].(string); ok {
+				diskType = v
+			}
+			if v, ok := value["file_system"].(string); ok {
+				fileSystem = v
+			}
+			if v, ok := value["mount_target"].(string); ok {
+				mountTarget = v
+			}
+			if v, ok := value["disk_partition"].(string); ok {
+				diskPartition = v
+			}
+
+			diskSize := int64(value["disk_size"].(int))
+			autoFormatAndMount := value["auto_format_and_mount"].(bool)
+			dataDisk := &tke.DataDisk{
+				DiskType:           &diskType,
+				FileSystem:         &fileSystem,
+				AutoFormatAndMount: &autoFormatAndMount,
+				MountTarget:        &mountTarget,
+				DiskPartition:      &diskPartition,
+			}
+			if diskSize > 0 {
+				dataDisk.DiskSize = &diskSize
+			}
+			setting.DataDisks[i] = dataDisk
+		}
+	}
+	if v, ok := dMap["is_schedule"]; ok {
+		setting.Unschedulable = helper.BoolToInt64Ptr(!v.(bool))
+	}
+
+	if v, ok := dMap["user_data"]; ok {
+		setting.UserScript = helper.String(v.(string))
+	}
+
+	if v, ok := dMap["pre_start_user_script"]; ok {
+		setting.PreStartUserScript = helper.String(v.(string))
+	}
+
+	if v, ok := dMap["taints"]; ok {
+		taints := v.([]interface{})
+		setting.Taints = make([]*tke.Taint, len(taints))
+		for i, d := range taints {
+			taint := d.(map[string]interface{})
+			var value, key, effect string
+			if v, ok := taint["key"].(string); ok {
+				key = v
+			}
+			if v, ok := taint["value"].(string); ok {
+				value = v
+			}
+			if v, ok := taint["effect"].(string); ok {
+				effect = v
+			}
+			taintItem := &tke.Taint{
+				Key:    &key,
+				Value:  &value,
+				Effect: &effect,
+			}
+			setting.Taints[i] = taintItem
+		}
+	}
+
+	if v, ok := dMap["docker_graph_path"]; ok {
+		setting.DockerGraphPath = helper.String(v.(string))
+	}
+
+	if v, ok := dMap["desired_pod_num"]; ok {
+		setting.DesiredPodNumber = helper.Int64(int64(v.(int)))
+	}
+
+	if temp, ok := dMap["extra_args"]; ok {
+		extraArgs := helper.InterfacesStrings(temp.([]interface{}))
+		clusterExtraArgs := tke.InstanceExtraArgs{}
+		clusterExtraArgs.Kubelet = make([]*string, 0)
+		for i := range extraArgs {
+			clusterExtraArgs.Kubelet = append(clusterExtraArgs.Kubelet, &extraArgs[i])
+		}
+		setting.ExtraArgs = &clusterExtraArgs
+	}
+
+	// get gpu_args
+	if v, ok := dMap["gpu_args"]; ok && len(v.([]interface{})) > 0 {
+		gpuArgs := v.([]interface{})[0].(map[string]interface{})
+
+		var (
+			migEnable    = gpuArgs["mig_enable"].(bool)
+			driver       = gpuArgs["driver"].(map[string]interface{})
+			cuda         = gpuArgs["cuda"].(map[string]interface{})
+			cudnn        = gpuArgs["cudnn"].(map[string]interface{})
+			customDriver = gpuArgs["custom_driver"].(map[string]interface{})
+		)
+		tkeGpuArgs := tke.GPUArgs{}
+		tkeGpuArgs.MIGEnable = &migEnable
+		if len(driver) > 0 {
+			tkeGpuArgs.Driver = &tke.DriverVersion{
+				Version: helper.String(driver["version"].(string)),
+				Name:    helper.String(driver["name"].(string)),
+			}
+		}
+		if len(cuda) > 0 {
+			tkeGpuArgs.CUDA = &tke.DriverVersion{
+				Version: helper.String(cuda["version"].(string)),
+				Name:    helper.String(cuda["name"].(string)),
+			}
+		}
+		if len(cudnn) > 0 {
+			tkeGpuArgs.CUDNN = &tke.CUDNN{
+				Version: helper.String(cudnn["version"].(string)),
+				Name:    helper.String(cudnn["name"].(string)),
+			}
+			if cudnn["doc_name"] != nil {
+				tkeGpuArgs.CUDNN.DocName = helper.String(cudnn["doc_name"].(string))
+			}
+			if cudnn["dev_name"] != nil {
+				tkeGpuArgs.CUDNN.DevName = helper.String(cudnn["dev_name"].(string))
+			}
+		}
+		if len(customDriver) > 0 {
+			tkeGpuArgs.CustomDriver = &tke.CustomDriver{
+				Address: helper.String(customDriver["address"].(string)),
+			}
+		}
+		setting.GPUArgs = &tkeGpuArgs
+	}
+
+	return setting
+}