fix: tke - modify params of requesting kubeconfig. (#1183)

* fix: tke - modify params of requesting kubeconfig.

* feat: tke - support intranet kubeconfig

Author: Kagashino

tencentcloud/data_source_tc_kubernetes_clusters.go

@@ -192,7 +192,12 @@ func tkeClusterInfo() map[string]*schema.Schema {
 		"kube_config": {
 			Type:        schema.TypeString,
 			Computed:    true,
-			Description: "kubernetes config.",
+			Description: "Kubernetes config.",
+		},
+		"kube_config_intranet": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Kubernetes config of private network.",
 		},
 	}
 
@@ -379,16 +384,38 @@ LOOP:
 		infoMap["pgw_endpoint"] = emptyStrFunc(securityRet.Response.PgwEndpoint)
 		infoMap["security_policy"] = policies
 
-		config, err := service.DescribeClusterConfig(ctx, info.ClusterId)
+		config, err := service.DescribeClusterConfig(ctx, info.ClusterId, true)
+		if err != nil {
+			err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+				config, err = service.DescribeClusterConfig(ctx, d.Id(), true)
+				if err != nil {
+					return retryError(err)
+				}
+				return nil
+			})
+		}
+		if err != nil {
+			log.Printf("[CRITAL]%s tencentcloud_kubernetes_clusters DescribeClusterInstances fail, reason:%s\n ", logId, err.Error())
+			return err
+		}
+
+		intranetConfig, err := service.DescribeClusterConfig(ctx, info.ClusterId, false)
 		if err != nil {
-			config, err = service.DescribeClusterConfig(ctx, info.ClusterId)
+			err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+				config, err = service.DescribeClusterConfig(ctx, d.Id(), false)
+				if err != nil {
+					return retryError(err)
+				}
+				return nil
+			})
 		}
 		if err != nil {
 			log.Printf("[CRITAL]%s tencentcloud_kubernetes_clusters DescribeClusterInstances fail, reason:%s\n ", logId, err.Error())
 			return err
 		}
 
 		infoMap["kube_config"] = config
+		infoMap["kube_config_intranet"] = intranetConfig
 		list = append(list, infoMap)
 	}
 

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -1431,7 +1431,12 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 		"kube_config": {
 			Type:        schema.TypeString,
 			Computed:    true,
-			Description: "kubernetes config.",
+			Description: "Kubernetes config.",
+		},
+		"kube_config_intranet": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Kubernetes config of private network.",
 		},
 	}
 
@@ -2369,10 +2374,10 @@ func resourceTencentCloudTkeClusterRead(d *schema.ResourceData, meta interface{}
 		_ = d.Set("auto_upgrade_cluster_level", info.AutoUpgradeClusterLevel)
 	}
 
-	config, err := service.DescribeClusterConfig(ctx, d.Id())
+	config, err := service.DescribeClusterConfig(ctx, d.Id(), true)
 	if err != nil {
 		err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
-			config, err = service.DescribeClusterConfig(ctx, d.Id())
+			config, err = service.DescribeClusterConfig(ctx, d.Id(), true)
 			if err != nil {
 				return retryError(err)
 			}
@@ -2386,6 +2391,23 @@ func resourceTencentCloudTkeClusterRead(d *schema.ResourceData, meta interface{}
 
 	_ = d.Set("kube_config", config)
 
+	intranetConfig, err := service.DescribeClusterConfig(ctx, d.Id(), false)
+	if err != nil {
+		err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+			intranetConfig, err = service.DescribeClusterConfig(ctx, d.Id(), false)
+			if err != nil {
+				return retryError(err)
+			}
+			return nil
+		})
+	}
+
+	if err != nil {
+		return nil
+	}
+
+	_ = d.Set("kube_config_intranet", intranetConfig)
+
 	_, workers, err := service.DescribeClusterInstances(ctx, d.Id())
 	if err != nil {
 		err = resource.Retry(10*readRetryTimeout, func() *resource.RetryError {

tencentcloud/service_tencentcloud_tke.go

@@ -370,10 +370,13 @@ func (me *TkeService) DescribeClusterLevelAttribute(ctx context.Context, id stri
 	return
 }
 
-func (me *TkeService) DescribeClusterConfig(ctx context.Context, id string) (config string, errRet error) {
+func (me *TkeService) DescribeClusterConfig(ctx context.Context, id string, isPublic bool) (config string, errRet error) {
 
 	logId := getLogId(ctx)
 	request := tke.NewDescribeClusterKubeconfigRequest()
+	if isPublic {
+		request.IsExtranet = &isPublic
+	}
 
 	defer func() {
 		if errRet != nil {

website/docs/d/kubernetes_clusters.html.markdown

@@ -62,7 +62,8 @@ In addition to all arguments above, the following attributes are exported:
   * `eni_subnet_ids` - Subnet IDs for cluster with VPC-CNI network mode.
   * `ignore_cluster_cidr_conflict` - Indicates whether to ignore the cluster cidr conflict error.
   * `is_non_static_ip_mode` - Indicates whether non-static ip mode is enabled.
-  * `kube_config` - kubernetes config.
+  * `kube_config_intranet` - Kubernetes config of private network.
+  * `kube_config` - Kubernetes config.
   * `kube_proxy_mode` - Cluster kube-proxy mode.
   * `network_type` - Cluster network type.
   * `node_name_type` - Node name type of cluster.

website/docs/r/kubernetes_cluster.html.markdown

@@ -623,7 +623,8 @@ In addition to all arguments above, the following attributes are exported:
 * `cluster_external_endpoint` - External network address to access.
 * `cluster_node_num` - Number of nodes in the cluster.
 * `domain` - Domain name for access.
-* `kube_config` - kubernetes config.
+* `kube_config_intranet` - Kubernetes config of private network.
+* `kube_config` - Kubernetes config.
 * `password` - Password of account.
 * `pgw_endpoint` - The Intranet address used for access.
 * `security_policy` - Access policy.