From 1250989eece66cf660dec9dede6bf0d91770078c Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Tue, 18 Mar 2025 17:23:38 +0800 Subject: [PATCH 1/2] add --- ...resource_tc_kubernetes_cluster_endpoint.go | 49 +++++++++++++++++++ .../kubernetes_cluster_endpoint.html.markdown | 2 + 2 files changed, 51 insertions(+) diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_cluster_endpoint.go b/tencentcloud/services/tke/resource_tc_kubernetes_cluster_endpoint.go index ba70d15be1..67dbe30339 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_cluster_endpoint.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_cluster_endpoint.go @@ -115,6 +115,16 @@ func ResourceTencentCloudTkeClusterEndpoint() *schema.Resource { Computed: true, Description: "The Intranet address used for access.", }, + "kube_config": { + Type: schema.TypeString, + Computed: true, + Description: "The Intranet address used for access.", + }, + "kube_config_intranet": { + Type: schema.TypeString, + Computed: true, + Description: "Kubernetes config of private network.", + }, }, } } @@ -169,6 +179,45 @@ func resourceTencentCloudTkeClusterEndpointRead(d *schema.ResourceData, meta int // _ = d.Set("managed_cluster_internet_security_policies", security.SecurityPolicy) //} + var config string + clusterInternet := d.Get("cluster_internet").(bool) + clusterIntranet := d.Get("cluster_intranet").(bool) + if clusterInternet { + err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { + result, e := service.DescribeClusterConfig(ctx, id, true) + if e != nil { + return tccommon.RetryError(e) + } + + config = result + return nil + }) + + if err != nil { + return err + } + + _ = d.Set("kube_config", config) + } + + if clusterIntranet { + err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { + result, e := service.DescribeClusterConfig(ctx, id, false) + if e != nil { + return tccommon.RetryError(e) + } + + config = result + return nil + }) + + if err != nil { + return err + } + + _ = d.Set("kube_config_intranet", config) + } + return nil } diff --git a/website/docs/r/kubernetes_cluster_endpoint.html.markdown b/website/docs/r/kubernetes_cluster_endpoint.html.markdown index 259fbed811..1d32b92f5c 100644 --- a/website/docs/r/kubernetes_cluster_endpoint.html.markdown +++ b/website/docs/r/kubernetes_cluster_endpoint.html.markdown @@ -67,6 +67,8 @@ In addition to all arguments above, the following attributes are exported: * `cluster_deploy_type` - Cluster deploy type of `MANAGED_CLUSTER` or `INDEPENDENT_CLUSTER`. * `cluster_external_endpoint` - External network address to access. * `domain` - Domain name for access. +* `kube_config_intranet` - Kubernetes config of private network. +* `kube_config` - The Intranet address used for access. * `password` - Password of account. * `pgw_endpoint` - The Intranet address used for access. * `user_name` - User name of account. From 712f2fdc0f9d64a11a8b03bce6c97a5c3830f83e Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Tue, 18 Mar 2025 17:26:32 +0800 Subject: [PATCH 2/2] add --- .changelog/3225.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/3225.txt diff --git a/.changelog/3225.txt b/.changelog/3225.txt new file mode 100644 index 0000000000..b6f896068a --- /dev/null +++ b/.changelog/3225.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_kubernetes_cluster_endpoint: add `kube_config`, `kube_config_intranet` fields output +``` \ No newline at end of file