Skip to content

refactor(tke): [115058279]iacg generates cluster, node pool, serverless node less resource code… #2585

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 10 commits into from
Jun 12, 2024
Merged

refactor(tke): [115058279]iacg generates cluster, node pool, serverless node less resource code… #2585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
714265e
iacg generates cluster, node pool, serverless node less resource code…
bruceybian Apr 9, 2024
cbef6b3
update tke
bruceybian Apr 9, 2024
14c616c
Remove useless methods
bruceybian Apr 9, 2024
6ac50c8
Handling exception handling in tke extension files
bruceybian Apr 9, 2024
331806c
update TestAccTencentCloudKubernetesClusterResourceLogsAddons
bruceybian Apr 9, 2024
d1c9daa
update tke cluster doc
bruceybian Jun 3, 2024
667bd3b
delete tkeSecurityInfo method
bruceybian Jun 3, 2024
c987a21
Modify kubernetes_node_pool resource
bruceybian Jun 11, 2024
42c581f
Modify the default value returned by the filter plugin
bruceybian Jun 11, 2024
7fb3eb8
Modify the default value returned by the filter plugin
bruceybian Jun 11, 2024
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
2 changes: 1 addition & 1 deletion tencentcloud/acctest/basic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ variable "international_subnet_id" {
// Tke Exclusive Network Environment
const (
TkeExclusiveVpcName = "keep_tke_exclusive_vpc"
DefaultTkeClusterId = "cls-ely08ic4"
DefaultTkeClusterId = "cls-r8gqwjw6"
DefaultTkeClusterName = "keep-tke-cluster"
DefaultTkeClusterType = "tke"
DefaultPrometheusId = "prom-1lspn8sw"
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/connectivity/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,8 +472,8 @@ func (me *TencentCloudClient) UseTkeClient(iacExtInfo ...IacExtInfo) *tke.Client
me.tkeConn.WithHttpTransport(&logRoundTripper)
return me.tkeConn
}

cpf := me.NewClientProfile(300)
cpf.Language = "zh-CN"
me.tkeConn, _ = tke.NewClient(me.Credential, me.Region, cpf)
me.tkeConn.WithHttpTransport(&logRoundTripper)

Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@ func Provider() *schema.Provider {
"tencentcloud_clb_security_group_attachment": clb.ResourceTencentCloudClbSecurityGroupAttachment(),
"tencentcloud_container_cluster": tke.ResourceTencentCloudContainerCluster(),
"tencentcloud_container_cluster_instance": tke.ResourceTencentCloudContainerClusterInstance(),
"tencentcloud_kubernetes_cluster": tke.ResourceTencentCloudTkeCluster(),
"tencentcloud_kubernetes_cluster": tke.ResourceTencentCloudKubernetesCluster(),
"tencentcloud_kubernetes_cluster_endpoint": tke.ResourceTencentCloudTkeClusterEndpoint(),
"tencentcloud_eks_cluster": tke.ResourceTencentCloudEksCluster(),
"tencentcloud_eks_container_instance": tke.ResourceTencentCloudEksContainerInstance(),
Expand All @@ -1121,8 +1121,8 @@ func Provider() *schema.Provider {
"tencentcloud_kubernetes_scale_worker": tke.ResourceTencentCloudTkeScaleWorker(),
"tencentcloud_kubernetes_cluster_attachment": tke.ResourceTencentCloudKubernetesClusterAttachment(),
"tencentcloud_kubernetes_node_pool": tke.ResourceTencentCloudKubernetesNodePool(),
"tencentcloud_kubernetes_serverless_node_pool": tke.ResourceTencentCloudTkeServerLessNodePool(),
"tencentcloud_kubernetes_backup_storage_location": tke.ResourceTencentCloudKubernetesBackupStorageLocation(),
"tencentcloud_kubernetes_serverless_node_pool": tke.ResourceTencentCloudKubernetesServerlessNodePool(),
"tencentcloud_kubernetes_encryption_protection": tke.ResourceTencentCloudKubernetesEncryptionProtection(),
"tencentcloud_mysql_backup_policy": cdb.ResourceTencentCloudMysqlBackupPolicy(),
"tencentcloud_mysql_account": cdb.ResourceTencentCloudMysqlAccount(),
Expand Down
3 changes: 3 additions & 0 deletions tencentcloud/services/tke/extension_tke.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ var TKE_ADDON_DEFAULT_VALUES_KEY = []string{
"global.cluster.clustertype",
"global.cluster.kubeversion",
"global.cluster.kubeminor",
"global.cluster.region",
"global.cluster.longregion",
"global.testenv",
}

const (
Expand Down
Loading
Loading