Skip to content

Commit d961b3f

Browse files
gitmkngitmkn
committed
Merge branch 'master' into fix/cos-cdc
2 parents f801d80 + 98cfc23 commit d961b3f

27 files changed

+1768
-45
lines changed

‎.changelog/2835.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_kubernetes_cluster: support `cdc_id` and `pre_start_user_script` parameter
3+
datasource/tencentcloud_kubernetes_clusters: support `cdc_id` parameter
4+
```

‎.changelog/2839.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
datasource/tencentcloud_kubernetes_scale_worker: adjust the message when creating instances all failed
3+
```

‎.changelog/2840.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
```release-note:new-resource
3+
tencentcloud_kubernetes_log_config
4+
```

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ require (
9191
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912
94-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001
94+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008
9595
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674

‎go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -925,8 +925,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.978/go.mod
925925
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.984/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
926926
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.993/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
927927
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
928-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
929-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
930928
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
931929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1001/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
932930
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1004/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
@@ -935,8 +933,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1006/go.mod
935933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1008 h1:BQJUiwOi2d368bF1qmdCjHjUMEt24vM6d68r9S+OrQM=
936934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1008/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
937935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
938-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
939-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
940936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
941937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
942938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
@@ -1040,6 +1036,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0d
10401036
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
10411037
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001 h1:qj+pw5MJFuOvA+a+yAA2JR8B4TmfX5H5D8jy3L0YKH0=
10421038
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001/go.mod h1:FVJUGrfLPiJWiKrH+62h38Iyo9mA2O1wuaPLMlbeDBI=
1039+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008 h1:Cz7JSuS2zxIBzAuZ2bKk3EmrZ1QgS2QAHmCDTDPWBz0=
1040+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008/go.mod h1:71PkDdVPT2Pd8yiuX6QFUDReTji39R/03dg1JwcjHWo=
10431041
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947 h1:iZfuU8S86kfqFsAVT/LUApP8L5cpT90hl2wSKiUDVvw=
10441042
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947/go.mod h1:eAgJ+XUEhffMq79zjpgHoR3PBVcciSg+LuPDC8hLWsE=
10451043
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=

‎tencentcloud/provider.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2138,7 +2138,8 @@ func Provider() *schema.Provider {
21382138
"tencentcloud_batch_apply_account_baselines": controlcenter.ResourceTencentCloudBatchApplyAccountBaselines(),
21392139
"tencentcloud_thpc_workspaces": thpc.ResourceTencentCloudThpcWorkspaces(),
21402140
"tencentcloud_kubernetes_health_check_policy": tke.ResourceTencentCloudKubernetesHealthCheckPolicy(),
2141-
"tencentcloud_lite_hbase_instance": emr.ResourceTencentCloudLiteHbaseInstance()},
2141+
"tencentcloud_lite_hbase_instance": emr.ResourceTencentCloudLiteHbaseInstance(),
2142+
"tencentcloud_kubernetes_log_config": tke.ResourceTencentCloudKubernetesLogConfig()},
21422143

21432144
ConfigureFunc: providerConfigure,
21442145
}

‎tencentcloud/provider.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,7 @@ Tencent Kubernetes Engine(TKE)
681681
tencentcloud_kubernetes_addon_config
682682
tencentcloud_kubernetes_native_node_pool
683683
tencentcloud_kubernetes_health_check_policy
684+
tencentcloud_kubernetes_log_config
684685

685686
TDMQ for Pulsar(tpulsar)
686687
Data Source

‎tencentcloud/services/tke/data_source_tc_kubernetes_clusters.go

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster.go

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster.md

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,18 +767,46 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
767767
768768
event_persistence {
769769
enabled = true
770-
log_set_id = "" # optional
770+
log_set_id = "" # optional
771771
topic_id = "" # optional
772772
}
773773
774774
cluster_audit {
775775
enabled = true
776-
log_set_id = "" # optional
776+
log_set_id = "" # optional
777777
topic_id = "" # optional
778778
}
779779
}
780780
```
781781

782+
Create a CDC scenario cluster
783+
```
784+
resource "tencentcloud_kubernetes_cluster" "cdc_cluster" {
785+
cdc_id = "cluster-xxxxx"
786+
vpc_id = "vpc-xxxxx"
787+
cluster_cidr = "192.168.0.0/16"
788+
cluster_max_pod_num = 64
789+
cluster_name = "test-cdc"
790+
cluster_desc = "test cluster desc"
791+
cluster_max_service_num = 1024
792+
cluster_version = "1.30.0"
793+
794+
cluster_os = "tlinux3.1x86_64"
795+
cluster_level = "L20"
796+
cluster_deploy_type = "INDEPENDENT_CLUSTER"
797+
798+
container_runtime = "containerd"
799+
runtime_version = "1.6.9"
800+
pre_start_user_script = "aXB0YWJsZXMgLUEgSU5QVVQgLXAgdGNwIC1zIDE2OS4yNTQuMC4wLzE5IC0tdGNwLWZsYWdzIFNZTixSU1QgU1lOIC1qIFRDUE1TUyAtLXNldC1tc3MgMTE2MAppcHRhYmxlcyAtQSBPVVRQVVQgLXAgdGNwIC1kIDE2OS4yNTQuMC4wLzE5IC0tdGNwLWZsYWdzIFNZTixSU1QgU1lOIC1qIFRDUE1TUyAtLXNldC1tc3MgMTE2MAoKZWNobyAnCmlwdGFibGVzIC1BIElOUFVUIC1wIHRjcCAtcyAxNjkuMjU0LjAuMC8xOSAtLXRjcC1mbGFncyBTWU4sUlNUIFNZTiAtaiBUQ1BNU1MgLS1zZXQtbXNzIDExNjAKaXB0YWJsZXMgLUEgT1VUUFVUIC1wIHRjcCAtZCAxNjkuMjU0LjAuMC8xOSAtLXRjcC1mbGFncyBTWU4sUlNUIFNZTiAtaiBUQ1BNU1MgLS1zZXQtbXNzIDExNjAKJyA+PiAvZXRjL3JjLmQvcmMubG9jYWw="
801+
exist_instance {
802+
node_role = "MASTER_ETCD"
803+
instances_para {
804+
instance_ids = ["ins-eeijdk16", "ins-84ku5rba", "ins-8oa3im2s"]
805+
}
806+
}
807+
}
808+
```
809+
782810
Import
783811

784812
tke cluster can be imported, e.g.

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment_extension.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ func resourceTencentCloudKubernetesClusterAttachmentCreatePostFillRequest0(ctx c
4545
req.InstanceAdvancedSettings = &tke.InstanceAdvancedSettings{}
4646
}
4747
// labels
48-
req.InstanceAdvancedSettings = &tke.InstanceAdvancedSettings{}
4948
req.InstanceAdvancedSettings.Labels = GetTkeLabels(d, "labels")
5049

5150
if dMap, ok := helper.InterfacesHeadMap(d, "worker_config"); ok {

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster_extension.go

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -149,34 +149,39 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
149149
Master: make([]tke.InstanceAdvancedSettings, 0),
150150
Work: make([]tke.InstanceAdvancedSettings, 0),
151151
}
152-
if masters, ok := d.GetOk("master_config"); ok {
153-
if clusterDeployType == TKE_DEPLOY_TYPE_MANAGED {
154-
return fmt.Errorf("if `cluster_deploy_type` is `MANAGED_CLUSTER` , You don't need define the master yourself")
155-
}
156-
var masterCount int64 = 0
157-
masterList := masters.([]interface{})
158-
for index := range masterList {
159-
master := masterList[index].(map[string]interface{})
160-
paraJson, count, err := tkeGetCvmRunInstancesPara(master, meta, vpcId, basic.ProjectId)
161-
if err != nil {
162-
return err
152+
153+
cdc_id := d.Get("cdc_id").(string)
154+
155+
if cdc_id == "" {
156+
if masters, ok := d.GetOk("master_config"); ok {
157+
if clusterDeployType == TKE_DEPLOY_TYPE_MANAGED {
158+
return fmt.Errorf("if `cluster_deploy_type` is `MANAGED_CLUSTER` , You don't need define the master yourself")
163159
}
160+
var masterCount int64 = 0
161+
masterList := masters.([]interface{})
162+
for index := range masterList {
163+
master := masterList[index].(map[string]interface{})
164+
paraJson, count, err := tkeGetCvmRunInstancesPara(master, meta, vpcId, basic.ProjectId)
165+
if err != nil {
166+
return err
167+
}
164168

165-
cvms.Master = append(cvms.Master, paraJson)
166-
masterCount += count
169+
cvms.Master = append(cvms.Master, paraJson)
170+
masterCount += count
167171

168-
if v, ok := master["desired_pod_num"]; ok {
169-
dpNum := int64(v.(int))
170-
if dpNum != DefaultDesiredPodNum {
171-
overrideSettings.Master = append(overrideSettings.Master, tke.InstanceAdvancedSettings{DesiredPodNumber: helper.Int64(dpNum)})
172+
if v, ok := master["desired_pod_num"]; ok {
173+
dpNum := int64(v.(int))
174+
if dpNum != DefaultDesiredPodNum {
175+
overrideSettings.Master = append(overrideSettings.Master, tke.InstanceAdvancedSettings{DesiredPodNumber: helper.Int64(dpNum)})
176+
}
172177
}
173178
}
179+
if masterCount < 3 {
180+
return fmt.Errorf("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` len(master_config) should >=3")
181+
}
182+
} else if clusterDeployType == TKE_DEPLOY_TYPE_INDEPENDENT {
183+
return fmt.Errorf("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` , You need define the master yourself")
174184
}
175-
if masterCount < 3 {
176-
return fmt.Errorf("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` len(master_config) should >=3")
177-
}
178-
} else if clusterDeployType == TKE_DEPLOY_TYPE_INDEPENDENT {
179-
return fmt.Errorf("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` , You need define the master yourself")
180185
}
181186

182187
if workers, ok := d.GetOk("worker_config"); ok {
@@ -261,6 +266,10 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
261266
iAdvanced.DockerGraphPath = "/var/lib/docker"
262267
}
263268

269+
if preStartUserScript, ok := d.GetOk("pre_start_user_script"); ok {
270+
iAdvanced.PreStartUserScript = preStartUserScript.(string)
271+
}
272+
264273
// ExistedInstancesForNode
265274
existInstances := make([]*tke.ExistedInstancesForNode, 0)
266275
if instances, ok := d.GetOk("exist_instance"); ok {
@@ -296,6 +305,7 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
296305
req.ClusterAdvancedSettings.VpcCniType = &advanced.VpcCniType
297306

298307
req.InstanceAdvancedSettings.DockerGraphPath = &iAdvanced.DockerGraphPath
308+
req.InstanceAdvancedSettings.PreStartUserScript = &iAdvanced.PreStartUserScript
299309
req.InstanceAdvancedSettings.UserScript = &iAdvanced.UserScript
300310

301311
if len(iAdvanced.DataDisks) > 0 {
@@ -311,7 +321,9 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
311321

312322
req.RunInstancesForNode = []*tke.RunInstancesForNode{}
313323

314-
if len(cvms.Master) != 0 {
324+
if cdc_id != "" {
325+
req.ClusterType = helper.String(clusterDeployType)
326+
} else if len(cvms.Master) != 0 {
315327

316328
var node tke.RunInstancesForNode
317329
node.NodeRole = helper.String(TKE_ROLE_MASTER_ETCD)

‎tencentcloud/services/tke/resource_tc_kubernetes_health_check_policy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ resource "tencentcloud_kubernetes_health_check_policy" "kubernetes_health_check_
6565
`
6666

6767
// const testAccKubernetesHealthCheckPolicyUpdate = testAccTkeCluster + `
68-
const testAccKubernetesHealthCheckPolicyCreate = `
68+
const testAccKubernetesHealthCheckPolicyUpdate = `
6969
7070
resource "tencentcloud_kubernetes_health_check_policy" "kubernetes_health_check_policy" {
7171
cluster_id = "cls-eh0da110"

0 commit comments

Comments
 (0)