Skip to content

Commit e691975

Browse files
authored
refactor(tke): [115058279]iacg generates cluster, node pool, serverless node less resource code… (#2585)
* iacg generates cluster, node pool, serverless node less resource code reconstruction * update tke * Remove useless methods * Handling exception handling in tke extension files * update TestAccTencentCloudKubernetesClusterResourceLogsAddons * update tke cluster doc * delete tkeSecurityInfo method * Modify kubernetes_node_pool resource * Modify the default value returned by the filter plugin * Modify the default value returned by the filter plugin
1 parent 4bf6f7a commit e691975

15 files changed

+6443
-4352
lines changed

tencentcloud/acctest/basic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ variable "international_subnet_id" {
214214
// Tke Exclusive Network Environment
215215
const (
216216
TkeExclusiveVpcName = "keep_tke_exclusive_vpc"
217-
DefaultTkeClusterId = "cls-ely08ic4"
217+
DefaultTkeClusterId = "cls-r8gqwjw6"
218218
DefaultTkeClusterName = "keep-tke-cluster"
219219
DefaultTkeClusterType = "tke"
220220
DefaultPrometheusId = "prom-1lspn8sw"

tencentcloud/connectivity/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,8 @@ func (me *TencentCloudClient) UseTkeClient(iacExtInfo ...IacExtInfo) *tke.Client
472472
me.tkeConn.WithHttpTransport(&logRoundTripper)
473473
return me.tkeConn
474474
}
475-
476475
cpf := me.NewClientProfile(300)
476+
cpf.Language = "zh-CN"
477477
me.tkeConn, _ = tke.NewClient(me.Credential, me.Region, cpf)
478478
me.tkeConn.WithHttpTransport(&logRoundTripper)
479479

tencentcloud/provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ func Provider() *schema.Provider {
11111111
"tencentcloud_clb_security_group_attachment": clb.ResourceTencentCloudClbSecurityGroupAttachment(),
11121112
"tencentcloud_container_cluster": tke.ResourceTencentCloudContainerCluster(),
11131113
"tencentcloud_container_cluster_instance": tke.ResourceTencentCloudContainerClusterInstance(),
1114-
"tencentcloud_kubernetes_cluster": tke.ResourceTencentCloudTkeCluster(),
1114+
"tencentcloud_kubernetes_cluster": tke.ResourceTencentCloudKubernetesCluster(),
11151115
"tencentcloud_kubernetes_cluster_endpoint": tke.ResourceTencentCloudTkeClusterEndpoint(),
11161116
"tencentcloud_eks_cluster": tke.ResourceTencentCloudEksCluster(),
11171117
"tencentcloud_eks_container_instance": tke.ResourceTencentCloudEksContainerInstance(),
@@ -1121,8 +1121,8 @@ func Provider() *schema.Provider {
11211121
"tencentcloud_kubernetes_scale_worker": tke.ResourceTencentCloudTkeScaleWorker(),
11221122
"tencentcloud_kubernetes_cluster_attachment": tke.ResourceTencentCloudKubernetesClusterAttachment(),
11231123
"tencentcloud_kubernetes_node_pool": tke.ResourceTencentCloudKubernetesNodePool(),
1124-
"tencentcloud_kubernetes_serverless_node_pool": tke.ResourceTencentCloudTkeServerLessNodePool(),
11251124
"tencentcloud_kubernetes_backup_storage_location": tke.ResourceTencentCloudKubernetesBackupStorageLocation(),
1125+
"tencentcloud_kubernetes_serverless_node_pool": tke.ResourceTencentCloudKubernetesServerlessNodePool(),
11261126
"tencentcloud_kubernetes_encryption_protection": tke.ResourceTencentCloudKubernetesEncryptionProtection(),
11271127
"tencentcloud_mysql_backup_policy": cdb.ResourceTencentCloudMysqlBackupPolicy(),
11281128
"tencentcloud_mysql_account": cdb.ResourceTencentCloudMysqlAccount(),

tencentcloud/services/tke/extension_tke.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ var TKE_ADDON_DEFAULT_VALUES_KEY = []string{
130130
"global.cluster.clustertype",
131131
"global.cluster.kubeversion",
132132
"global.cluster.kubeminor",
133+
"global.cluster.region",
134+
"global.cluster.longregion",
135+
"global.testenv",
133136
}
134137

135138
const (

0 commit comments

Comments
 (0)