feat(tke): [119910893] support taints and security_group for tencentcloud_kubernetes_cluster_attachment (#2866)

* feat(tke): [119910893] support taints for tencentcloud_kubernetes_cluster_attachment

* add doc and changelog

* support security group

Author: lyu571

.changelog/2866.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/tencentcloud_kubernetes_cluster_attachment: support param `taints` of worker_config
+```
+
+```release-note:enhancement
+resource/tencentcloud_kubernetes_cluster_attachment: support param `security_groups`
+```

tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment.go

@@ -165,6 +165,34 @@ func ResourceTencentCloudKubernetesClusterAttachment() *schema.Resource {
 							ForceNew:    true,
 							Description: "Base64-encoded user script, executed before initializing the node, currently only effective for adding existing nodes.",
 						},
+						"taints": {
+							Type:        schema.TypeList,
+							Optional:    true,
+							ForceNew:    true,
+							Description: "Node taint.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"key": {
+										Type:        schema.TypeString,
+										Optional:    true,
+										ForceNew:    true,
+										Description: "Key of the taint.",
+									},
+									"value": {
+										Type:        schema.TypeString,
+										Optional:    true,
+										ForceNew:    true,
+										Description: "Value of the taint.",
+									},
+									"effect": {
+										Type:        schema.TypeString,
+										Optional:    true,
+										ForceNew:    true,
+										Description: "Effect of the taint.",
+									},
+								},
+							},
+						},
 						"is_schedule": {
 							Type:        schema.TypeBool,
 							Optional:    true,
@@ -397,8 +425,10 @@ func ResourceTencentCloudKubernetesClusterAttachment() *schema.Resource {
 			},
 
 			"security_groups": {
-				Type:        schema.TypeSet,
+				Type:        schema.TypeList,
 				Computed:    true,
+				Optional:    true,
+				ForceNew:    true,
 				Description: "A list of security group IDs after attach to cluster.",
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
@@ -490,6 +520,22 @@ func resourceTencentCloudKubernetesClusterAttachmentCreate(d *schema.ResourceDat
 		if v, ok := instanceAdvancedSettingsMap["pre_start_user_script"]; ok {
 			instanceAdvancedSettings.PreStartUserScript = helper.String(v.(string))
 		}
+		if v, ok := instanceAdvancedSettingsMap["taints"]; ok {
+			for _, item := range v.([]interface{}) {
+				taintsMap := item.(map[string]interface{})
+				taint := tke.Taint{}
+				if v, ok := taintsMap["key"]; ok {
+					taint.Key = helper.String(v.(string))
+				}
+				if v, ok := taintsMap["value"]; ok {
+					taint.Value = helper.String(v.(string))
+				}
+				if v, ok := taintsMap["effect"]; ok {
+					taint.Effect = helper.String(v.(string))
+				}
+				instanceAdvancedSettings.Taints = append(instanceAdvancedSettings.Taints, &taint)
+			}
+		}
 		if v, ok := instanceAdvancedSettingsMap["docker_graph_path"]; ok {
 			instanceAdvancedSettings.DockerGraphPath = helper.String(v.(string))
 		}
@@ -510,6 +556,14 @@ func resourceTencentCloudKubernetesClusterAttachmentCreate(d *schema.ResourceDat
 		request.HostName = helper.String(v.(string))
 	}
 
+	if v, ok := d.GetOk("security_groups"); ok {
+		securityGroupIdsSet := v.([]interface{})
+		for i := range securityGroupIdsSet {
+			securityGroupIds := securityGroupIdsSet[i].(string)
+			request.SecurityGroupIds = append(request.SecurityGroupIds, helper.String(securityGroupIds))
+		}
+	}
+
 	if v, ok := d.GetOk("worker_config_overrides"); ok {
 		for _, item := range v.([]interface{}) {
 			instanceAdvancedSettingsOverridesMap := item.(map[string]interface{})

tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment_extension.go

@@ -170,6 +170,7 @@ func resourceTencentCloudKubernetesClusterAttachmentReadRequestOnError2(ctx cont
 }
 
 func resourceTencentCloudKubernetesClusterAttachmentReadRequestOnSuccess2(ctx context.Context, resp *tke.Instance) *resource.RetryError {
+	// d := tccommon.ResourceDataFromContext(ctx)
 	if resp == nil {
 		return nil
 	}
@@ -196,6 +197,33 @@ func resourceTencentCloudKubernetesClusterAttachmentReadRequestOnSuccess2(ctx co
 		))
 	}
 
+	// api cannot return Taints
+	// if resp.InstanceAdvancedSettings.Taints != nil {
+	// 	iAdvanced := resp.InstanceAdvancedSettings
+	// 	taintsList := make([]map[string]interface{}, 0, len(iAdvanced.Taints))
+	// 	if iAdvanced.Taints != nil {
+	// 		for _, taints := range iAdvanced.Taints {
+	// 			taintsMap := map[string]interface{}{}
+
+	// 			if taints.Key != nil {
+	// 				taintsMap["key"] = taints.Key
+	// 			}
+
+	// 			if taints.Value != nil {
+	// 				taintsMap["value"] = taints.Value
+	// 			}
+
+	// 			if taints.Effect != nil {
+	// 				taintsMap["effect"] = taints.Effect
+	// 			}
+
+	// 			taintsList = append(taintsList, taintsMap)
+	// 		}
+
+	// 		_ = d.Set("taints", taintsList)
+	// 	}
+	// }
+
 	return nil
 }
 

website/docs/r/kubernetes_cluster_attachment.html.markdown

@@ -117,6 +117,7 @@ The following arguments are supported:
 * `key_ids` - (Optional, List: [`String`], ForceNew) The key pair to use for the instance, it looks like skey-16jig7tx, it should be set if `password` not set.
 * `labels` - (Optional, Map, ForceNew) Labels of tke attachment exits CVM.
 * `password` - (Optional, String, ForceNew) Password to access, should be set if `key_ids` not set.
+* `security_groups` - (Optional, List: [`String`], ForceNew) A list of security group IDs after attach to cluster.
 * `unschedulable` - (Optional, Int, ForceNew) Sets whether the joining node participates in the schedule. Default is `0`, which means it participates in scheduling. Non-zero(eg: `1`) number means it does not participate in scheduling.
 * `worker_config_overrides` - (Optional, List, ForceNew) Override variable worker_config, commonly used to attach existing instances.
 * `worker_config` - (Optional, List, ForceNew) Deploy the machine configuration information of the 'WORKER', commonly used to attach existing instances.
@@ -155,6 +156,12 @@ The `gpu_args` object of `worker_config` supports the following:
 * `driver` - (Optional, Map) GPU driver version. Format like: `{ version: String, name: String }`. `version`: Version of GPU driver or CUDA; `name`: Name of GPU driver or CUDA.
 * `mig_enable` - (Optional, Bool) Whether to enable MIG.
 
+The `taints` object of `worker_config` supports the following:
+
+* `effect` - (Optional, String, ForceNew) Effect of the taint.
+* `key` - (Optional, String, ForceNew) Key of the taint.
+* `value` - (Optional, String, ForceNew) Value of the taint.
+
 The `worker_config_overrides` object supports the following:
 
 * `data_disk` - (Optional, List, ForceNew) Configurations of data disk.
@@ -177,14 +184,14 @@ The `worker_config` object supports the following:
 * `is_schedule` - (Optional, Bool, ForceNew, **Deprecated**) This argument was deprecated, use `unschedulable` instead. Indicate to schedule the adding node or not. Default is true.
 * `mount_target` - (Optional, String, ForceNew) Mount target. Default is not mounting.
 * `pre_start_user_script` - (Optional, String, ForceNew) Base64-encoded user script, executed before initializing the node, currently only effective for adding existing nodes.
+* `taints` - (Optional, List, ForceNew) Node taint.
 * `user_data` - (Optional, String, ForceNew) Base64-encoded User Data text, the length limit is 16KB.
 
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - ID of the resource.
-* `security_groups` - A list of security group IDs after attach to cluster.
 * `state` - State of the node.