Skip to content

Commit 7c9d555

Browse files
authored
feat: tke - support separate tke cluster endpoint resource switch (#1132)
* feat: tke - support separate tke cluster endpoint resource switch * fix: tke endpoint - remove duplicate foo block * fix: tke endpoint - fix assert * fix: tke endpoint - add retry for nodepool
1 parent 4974ddc commit 7c9d555

File tree

7 files changed

+658
-15
lines changed

7 files changed

+658
-15
lines changed

tencentcloud/basic_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -601,9 +601,9 @@ variable "tke_cidr_a" {
601601
default = [
602602
"10.31.0.0/23",
603603
"10.31.2.0/24",
604-
"10.31.3.0/25",
605-
"10.31.3.128/26",
606-
"10.31.3.192/26"
604+
"10.31.3.0/24",
605+
"10.31.16.0/24",
606+
"10.31.32.0/24"
607607
]
608608
}
609609

tencentcloud/provider.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ Tencent Kubernetes Engine(TKE)
373373
tencentcloud_eks_container_instance
374374
tencentcloud_kubernetes_auth_attachment
375375
tencentcloud_kubernetes_addon_attachment
376+
tencentcloud_kubernetes_cluster_endpoint
376377
377378
TDMQ
378379
Resource
@@ -983,6 +984,7 @@ func Provider() terraform.ResourceProvider {
983984
"tencentcloud_container_cluster": resourceTencentCloudContainerCluster(),
984985
"tencentcloud_container_cluster_instance": resourceTencentCloudContainerClusterInstance(),
985986
"tencentcloud_kubernetes_cluster": resourceTencentCloudTkeCluster(),
987+
"tencentcloud_kubernetes_cluster_endpoint": resourceTencentCloudTkeClusterEndpoint(),
986988
"tencentcloud_eks_cluster": resourceTencentCloudEksCluster(),
987989
"tencentcloud_eks_container_instance": resourceTencentCloudEksContainerInstance(),
988990
"tencentcloud_kubernetes_addon_attachment": resourceTencentCloudTkeAddonAttachment(),

tencentcloud/resource_tc_kubernetes_cluster.go

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2504,16 +2504,18 @@ func resourceTencentCloudTkeClusterRead(d *schema.ResourceData, meta interface{}
25042504
_ = d.Set("pgw_endpoint", emptyStrFunc(securityRet.Response.PgwEndpoint))
25052505
_ = d.Set("security_policy", policies)
25062506

2507-
if emptyStrFunc(securityRet.Response.ClusterExternalEndpoint) == "" {
2508-
_ = d.Set("cluster_internet", false)
2509-
} else {
2510-
_ = d.Set("cluster_internet", true)
2511-
}
2507+
if v, ok := d.GetOk("worker_config"); ok && len(v.([]interface{})) > 0 {
2508+
if emptyStrFunc(securityRet.Response.ClusterExternalEndpoint) == "" {
2509+
_ = d.Set("cluster_internet", false)
2510+
} else {
2511+
_ = d.Set("cluster_internet", true)
2512+
}
25122513

2513-
if emptyStrFunc(securityRet.Response.PgwEndpoint) == "" {
2514-
_ = d.Set("cluster_intranet", false)
2515-
} else {
2516-
_ = d.Set("cluster_intranet", true)
2514+
if emptyStrFunc(securityRet.Response.PgwEndpoint) == "" {
2515+
_ = d.Set("cluster_intranet", false)
2516+
} else {
2517+
_ = d.Set("cluster_intranet", true)
2518+
}
25172519
}
25182520

25192521
var globalConfig *tke.ClusterAsGroupOption
@@ -2797,7 +2799,6 @@ func resourceTencentCloudTkeClusterUpdate(d *schema.ResourceData, meta interface
27972799
return err
27982800
}
27992801
}
2800-
d.SetPartial("cluster_internet")
28012802
}
28022803

28032804
if clusterInternet {
@@ -2810,8 +2811,6 @@ func resourceTencentCloudTkeClusterUpdate(d *schema.ResourceData, meta interface
28102811
}
28112812
d.SetPartial("managed_cluster_internet_security_policies")
28122813
}
2813-
} else {
2814-
d.SetPartial("managed_cluster_internet_security_policies")
28152814
}
28162815

28172816
if d.HasChange("project_id") || d.HasChange("cluster_name") || d.HasChange("cluster_desc") || d.HasChange("cluster_level") || d.HasChange("auto_upgrade_cluster_level") {

0 commit comments

Comments
 (0)