Skip to content

feat: tke - support separate tke cluster endpoint resource switch #1132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 8, 2022
Merged

feat: tke - support separate tke cluster endpoint resource switch #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccffcd2
feat: tke - support separate tke cluster endpoint resource switch
Kagashino Jul 4, 2022
d9f1e16
fix: tke endpoint - remove duplicate foo block
Kagashino Jul 5, 2022
cd0deff
fix: tke endpoint - fix assert
Kagashino Jul 6, 2022
f0d4d58
fix: tke endpoint - add retry for nodepool
Kagashino Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tencentcloud/basic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,9 +601,9 @@ variable "tke_cidr_a" {
default = [
"10.31.0.0/23",
"10.31.2.0/24",
"10.31.3.0/25",
"10.31.3.128/26",
"10.31.3.192/26"
"10.31.3.0/24",
"10.31.16.0/24",
"10.31.32.0/24"
]
}

Expand Down
2 changes: 2 additions & 0 deletions tencentcloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ Tencent Kubernetes Engine(TKE)
tencentcloud_eks_container_instance
tencentcloud_kubernetes_auth_attachment
tencentcloud_kubernetes_addon_attachment
tencentcloud_kubernetes_cluster_endpoint

TDMQ
Resource
Expand Down Expand Up @@ -977,6 +978,7 @@ func Provider() terraform.ResourceProvider {
"tencentcloud_container_cluster": resourceTencentCloudContainerCluster(),
"tencentcloud_container_cluster_instance": resourceTencentCloudContainerClusterInstance(),
"tencentcloud_kubernetes_cluster": resourceTencentCloudTkeCluster(),
"tencentcloud_kubernetes_cluster_endpoint": resourceTencentCloudTkeClusterEndpoint(),
"tencentcloud_eks_cluster": resourceTencentCloudEksCluster(),
"tencentcloud_eks_container_instance": resourceTencentCloudEksContainerInstance(),
"tencentcloud_kubernetes_addon_attachment": resourceTencentCloudTkeAddonAttachment(),
Expand Down
23 changes: 11 additions & 12 deletions tencentcloud/resource_tc_kubernetes_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2484,16 +2484,18 @@ func resourceTencentCloudTkeClusterRead(d *schema.ResourceData, meta interface{}
_ = d.Set("pgw_endpoint", emptyStrFunc(securityRet.Response.PgwEndpoint))
_ = d.Set("security_policy", policies)

if emptyStrFunc(securityRet.Response.ClusterExternalEndpoint) == "" {
_ = d.Set("cluster_internet", false)
} else {
_ = d.Set("cluster_internet", true)
}
if v, ok := d.GetOk("worker_config"); ok && len(v.([]interface{})) > 0 {
if emptyStrFunc(securityRet.Response.ClusterExternalEndpoint) == "" {
_ = d.Set("cluster_internet", false)
} else {
_ = d.Set("cluster_internet", true)
}

if emptyStrFunc(securityRet.Response.PgwEndpoint) == "" {
_ = d.Set("cluster_intranet", false)
} else {
_ = d.Set("cluster_intranet", true)
if emptyStrFunc(securityRet.Response.PgwEndpoint) == "" {
_ = d.Set("cluster_intranet", false)
} else {
_ = d.Set("cluster_intranet", true)
}
}

var globalConfig *tke.ClusterAsGroupOption
Expand Down Expand Up @@ -2777,7 +2779,6 @@ func resourceTencentCloudTkeClusterUpdate(d *schema.ResourceData, meta interface
return err
}
}
d.SetPartial("cluster_internet")
}

if clusterInternet {
Expand All @@ -2790,8 +2791,6 @@ func resourceTencentCloudTkeClusterUpdate(d *schema.ResourceData, meta interface
}
d.SetPartial("managed_cluster_internet_security_policies")
}
} else {
d.SetPartial("managed_cluster_internet_security_policies")
}

if d.HasChange("project_id") || d.HasChange("cluster_name") || d.HasChange("cluster_desc") || d.HasChange("cluster_level") || d.HasChange("auto_upgrade_cluster_level") {
Expand Down
Loading