feat(tke): [118298202] tencentcloud_kubernetes_cluster support cdc_id and pre_start_user_script parameter

.changelog/2835.txt

@@ -0,0 +1,4 @@
+```release-note:enhancement
+resource/tencentcloud_kubernetes_cluster: support `cdc_id` and `pre_start_user_script` parameter
+datasource/tencentcloud_kubernetes_clusters: support `cdc_id` parameter
+```

go.mod

@@ -91,7 +91,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674

go.sum

@@ -1038,8 +1038,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912 h1:XGOKd5u
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912/go.mod h1:iqTDU0pVTQ8RCeMJPk/PAWl9HeI1DFMd1h07yMH7RGU=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0dVKQTD06xJ84B5asHViNJHrZmGojdAWEPIsITM=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001 h1:qj+pw5MJFuOvA+a+yAA2JR8B4TmfX5H5D8jy3L0YKH0=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001/go.mod h1:FVJUGrfLPiJWiKrH+62h38Iyo9mA2O1wuaPLMlbeDBI=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008 h1:Cz7JSuS2zxIBzAuZ2bKk3EmrZ1QgS2QAHmCDTDPWBz0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008/go.mod h1:71PkDdVPT2Pd8yiuX6QFUDReTji39R/03dg1JwcjHWo=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947 h1:iZfuU8S86kfqFsAVT/LUApP8L5cpT90hl2wSKiUDVvw=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947/go.mod h1:eAgJ+XUEhffMq79zjpgHoR3PBVcciSg+LuPDC8hLWsE=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=

tencentcloud/services/tke/resource_tc_kubernetes_cluster.md

@@ -767,18 +767,46 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
 
   event_persistence {
     enabled = true
-	log_set_id = "" # optional
+    log_set_id = "" # optional
     topic_id = "" # optional
   }
 
   cluster_audit {
     enabled = true
-	log_set_id = "" # optional
+    log_set_id = "" # optional
     topic_id = "" # optional
   }
 }
 ```
 
+Create a CDC scenario cluster
+```
+resource "tencentcloud_kubernetes_cluster" "cdc_cluster" {
+    cdc_id = "cluster-xxxxx"
+    vpc_id = "vpc-xxxxx"
+    cluster_cidr = "192.168.0.0/16"
+    cluster_max_pod_num = 64
+    cluster_name = "test-cdc"
+    cluster_desc = "test cluster desc"
+    cluster_max_service_num = 1024
+    cluster_version = "1.30.0"
+
+    cluster_os = "tlinux3.1x86_64"
+    cluster_level = "L20"
+    cluster_deploy_type = "INDEPENDENT_CLUSTER"
+
+    container_runtime = "containerd"
+    runtime_version = "1.6.9"
+    pre_start_user_script = "aXB0YWJsZXMgLUEgSU5QVVQgLXAgdGNwIC1zIDE2OS4yNTQuMC4wLzE5IC0tdGNwLWZsYWdzIFNZTixSU1QgU1lOIC1qIFRDUE1TUyAtLXNldC1tc3MgMTE2MAppcHRhYmxlcyAtQSBPVVRQVVQgLXAgdGNwIC1kIDE2OS4yNTQuMC4wLzE5IC0tdGNwLWZsYWdzIFNZTixSU1QgU1lOIC1qIFRDUE1TUyAtLXNldC1tc3MgMTE2MAoKZWNobyAnCmlwdGFibGVzIC1BIElOUFVUIC1wIHRjcCAtcyAxNjkuMjU0LjAuMC8xOSAtLXRjcC1mbGFncyBTWU4sUlNUIFNZTiAtaiBUQ1BNU1MgLS1zZXQtbXNzIDExNjAKaXB0YWJsZXMgLUEgT1VUUFVUIC1wIHRjcCAtZCAxNjkuMjU0LjAuMC8xOSAtLXRjcC1mbGFncyBTWU4sUlNUIFNZTiAtaiBUQ1BNU1MgLS1zZXQtbXNzIDExNjAKJyA+PiAvZXRjL3JjLmQvcmMubG9jYWw="
+    exist_instance {
+        node_role = "MASTER_ETCD"
+        instances_para {
+        instance_ids = ["ins-eeijdk16", "ins-84ku5rba", "ins-8oa3im2s"]
+        }
+    }
+}
+```
+
 Import
 
 tke cluster can be imported, e.g.

tencentcloud/services/tke/resource_tc_kubernetes_cluster_extension.go

@@ -149,34 +149,39 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
 		Master: make([]tke.InstanceAdvancedSettings, 0),
 		Work:   make([]tke.InstanceAdvancedSettings, 0),
 	}
-	if masters, ok := d.GetOk("master_config"); ok {
-		if clusterDeployType == TKE_DEPLOY_TYPE_MANAGED {
-			return fmt.Errorf("if `cluster_deploy_type` is `MANAGED_CLUSTER` , You don't need define the master yourself")
-		}
-		var masterCount int64 = 0
-		masterList := masters.([]interface{})
-		for index := range masterList {
-			master := masterList[index].(map[string]interface{})
-			paraJson, count, err := tkeGetCvmRunInstancesPara(master, meta, vpcId, basic.ProjectId)
-			if err != nil {
-				return err
+
+	cdc_id := d.Get("cdc_id").(string)
+
+	if cdc_id == "" {
+		if masters, ok := d.GetOk("master_config"); ok {
+			if clusterDeployType == TKE_DEPLOY_TYPE_MANAGED {
+				return fmt.Errorf("if `cluster_deploy_type` is `MANAGED_CLUSTER` , You don't need define the master yourself")
 			}
+			var masterCount int64 = 0
+			masterList := masters.([]interface{})
+			for index := range masterList {
+				master := masterList[index].(map[string]interface{})
+				paraJson, count, err := tkeGetCvmRunInstancesPara(master, meta, vpcId, basic.ProjectId)
+				if err != nil {
+					return err
+				}
 
-			cvms.Master = append(cvms.Master, paraJson)
-			masterCount += count
+				cvms.Master = append(cvms.Master, paraJson)
+				masterCount += count
 
-			if v, ok := master["desired_pod_num"]; ok {
-				dpNum := int64(v.(int))
-				if dpNum != DefaultDesiredPodNum {
-					overrideSettings.Master = append(overrideSettings.Master, tke.InstanceAdvancedSettings{DesiredPodNumber: helper.Int64(dpNum)})
+				if v, ok := master["desired_pod_num"]; ok {
+					dpNum := int64(v.(int))
+					if dpNum != DefaultDesiredPodNum {
+						overrideSettings.Master = append(overrideSettings.Master, tke.InstanceAdvancedSettings{DesiredPodNumber: helper.Int64(dpNum)})
+					}
 				}
 			}
+			if masterCount < 3 {
+				return fmt.Errorf("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` len(master_config) should >=3")
+			}
+		} else if clusterDeployType == TKE_DEPLOY_TYPE_INDEPENDENT {
+			return fmt.Errorf("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` , You need define the master yourself")
 		}
-		if masterCount < 3 {
-			return fmt.Errorf("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` len(master_config) should >=3")
-		}
-	} else if clusterDeployType == TKE_DEPLOY_TYPE_INDEPENDENT {
-		return fmt.Errorf("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` , You need define the master yourself")
 	}
 
 	if workers, ok := d.GetOk("worker_config"); ok {
@@ -261,6 +266,10 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
 		iAdvanced.DockerGraphPath = "/var/lib/docker"
 	}
 
+	if preStartUserScript, ok := d.GetOk("pre_start_user_script"); ok {
+		iAdvanced.PreStartUserScript = preStartUserScript.(string)
+	}
+
 	// ExistedInstancesForNode
 	existInstances := make([]*tke.ExistedInstancesForNode, 0)
 	if instances, ok := d.GetOk("exist_instance"); ok {
@@ -296,6 +305,7 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
 	req.ClusterAdvancedSettings.VpcCniType = &advanced.VpcCniType
 
 	req.InstanceAdvancedSettings.DockerGraphPath = &iAdvanced.DockerGraphPath
+	req.InstanceAdvancedSettings.PreStartUserScript = &iAdvanced.PreStartUserScript
 	req.InstanceAdvancedSettings.UserScript = &iAdvanced.UserScript
 
 	if len(iAdvanced.DataDisks) > 0 {
@@ -311,7 +321,9 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
 
 	req.RunInstancesForNode = []*tke.RunInstancesForNode{}
 
-	if len(cvms.Master) != 0 {
+	if cdc_id != "" {
+		req.ClusterType = helper.String(clusterDeployType)
+	} else if len(cvms.Master) != 0 {
 
 		var node tke.RunInstancesForNode
 		node.NodeRole = helper.String(TKE_ROLE_MASTER_ETCD)

tencentcloud/services/tke/resource_tc_kubernetes_health_check_policy_test.go

@@ -65,7 +65,7 @@ resource "tencentcloud_kubernetes_health_check_policy" "kubernetes_health_check_
 `
 
 // const testAccKubernetesHealthCheckPolicyUpdate = testAccTkeCluster + `
-const testAccKubernetesHealthCheckPolicyCreate = `
+const testAccKubernetesHealthCheckPolicyUpdate = `
 
 resource "tencentcloud_kubernetes_health_check_policy" "kubernetes_health_check_policy" {
 	cluster_id = "cls-eh0da110"

tencentcloud/services/tke/service_tencentcloud_tke.go

@@ -73,14 +73,15 @@ type RunInstancesForNode struct {
 }
 
 type InstanceAdvancedSettings struct {
-	MountTarget     string
-	DockerGraphPath string
-	UserScript      string
-	Unschedulable   int64
-	DesiredPodNum   int64
-	Labels          []*tke.Label
-	DataDisks       []*tke.DataDisk
-	ExtraArgs       tke.InstanceExtraArgs
+	MountTarget        string
+	DockerGraphPath    string
+	PreStartUserScript string
+	UserScript         string
+	Unschedulable      int64
+	DesiredPodNum      int64
+	Labels             []*tke.Label
+	DataDisks          []*tke.DataDisk
+	ExtraArgs          tke.InstanceExtraArgs
 }
 
 type ClusterCidrSettings struct {