Skip to content

Commit ff283f2

Browse files
bruceybianbruceybian
authored
feat(tke): [116938614]Add tke native node pool resource and datasource (#2658)
* iacg generates tencentcloud_native_node_pool resource code * iacg generates tencentcloud_kubernetes_cluster_native_node_pools datasource code * update native node pool test * Add test cases and documentation * add changelog 2658.txt * update changelog * Modify the internet_accessible and instance_charge_prepaid fields to forceNew * update annotations code * update annotations
1 parent 9f04e72 commit ff283f2

25 files changed

+5674
-224
lines changed

‎.changelog/2658.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:new-resource
2+
tencentcloud_kubernetes_native_node_pool
3+
```
4+
5+
````release-note:new-data-source
6+
tencentcloud_kubernetes_cluster_native_node_pools
7+
```

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ require (
9191
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.932
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912
94-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916
94+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.921
9595
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674

‎go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -933,6 +933,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.920 h1:Kmm4
933933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.920/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
934934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932 h1:MB1+Ll6JxWTpZw/v0dMRvMEJhlcDKxK/JMQ8O5owRVc=
935935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.932/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
936+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.921 h1:xB4iO1xX84bVhHIizPC27txPJIN7cmKYvZmuSiGShxM=
937+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.921/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
936938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
937939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
938940
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
@@ -1039,6 +1041,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.807 h1:/ziV4FF
10391041
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.807/go.mod h1:uRsVm3rUbE/YH4+G8o1Ppyl4ENtbLWliUxPk1yDr95k=
10401042
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916 h1:/ERZ1hNzLfbtvOqjydV9291yC/try3gSJGsrnmT36Xs=
10411043
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916/go.mod h1:fhRshMGZ9Y+yDte3knOAlXhUQApfhhq5reebRFHi6VA=
1044+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.921 h1:jCrZDMDNNI5TFZEEk5AXMcNThDzxAHMKrQFspoqEdCA=
1045+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.921/go.mod h1:waWKRKzVqvpXYIMuJvrXBEX9igTo5VntpP/Soi6O5Hc=
10421046
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756 h1:89M6uA8Y/FC1b88TFxvRManGW+i62Isqg1lW8HjHDvU=
10431047
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756/go.mod h1:AJAItBOTaarpDpUF7pNp0tuz2Y6H2oFuMcyKouPs1IE=
10441048
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=

‎tencentcloud/acctest/tke_basic.go

Lines changed: 0 additions & 204 deletions
This file was deleted.

‎tencentcloud/connectivity/client.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ import (
9797
tem "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem/v20210701"
9898
teo "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901"
9999
tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
100+
tke2 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20220501"
100101
trocket "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket/v20230308"
101102
tse "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse/v20201207"
102103
tsf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf/v20180326"
@@ -205,6 +206,7 @@ type TencentCloudClient struct {
205206
regionConn *region.Client
206207
//internal version: replace client begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
207208
//internal version: replace client end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
209+
tke2Conn *tke2.Client
208210
}
209211

210212
// NewClientProfile returns a new ClientProfile
@@ -1575,3 +1577,22 @@ func getEnvDefault(key string, defVal int) int {
15751577
}
15761578
return timeOut
15771579
}
1580+
1581+
// UseTke2Client returns tke client for service
1582+
func (me *TencentCloudClient) UseTke2Client(iacExtInfo ...IacExtInfo) *tke2.Client {
1583+
var logRoundTripper LogRoundTripper
1584+
if len(iacExtInfo) != 0 {
1585+
logRoundTripper.InstanceId = iacExtInfo[0].InstanceId
1586+
}
1587+
1588+
if me.tke2Conn != nil {
1589+
me.tke2Conn.WithHttpTransport(&logRoundTripper)
1590+
return me.tke2Conn
1591+
}
1592+
1593+
cpf := me.NewClientProfile(300)
1594+
me.tke2Conn, _ = tke2.NewClient(me.Credential, me.Region, cpf)
1595+
me.tke2Conn.WithHttpTransport(&logRoundTripper)
1596+
1597+
return me.tke2Conn
1598+
}

‎tencentcloud/provider.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ func Provider() *schema.Provider {
987987
"tencentcloud_clickhouse_instance_shards": cdwch.DataSourceTencentCloudClickhouseInstanceShards(),
988988
"tencentcloud_clickhouse_instance_nodes": cdwch.DataSourceTencentCloudClickhouseInstanceNodes(),
989989
"tencentcloud_organization_org_share_area": tco.DataSourceTencentCloudOrganizationOrgShareArea(),
990-
},
990+
"tencentcloud_kubernetes_cluster_native_node_pools": tke.DataSourceTencentCloudKubernetesClusterNativeNodePools()},
991991

992992
ResourcesMap: map[string]*schema.Resource{
993993
"tencentcloud_project": project.ResourceTencentCloudProject(),
@@ -1974,7 +1974,8 @@ func Provider() *schema.Provider {
19741974
"tencentcloud_csip_risk_center": csip.ResourceTencentCloudCsipRiskCenter(),
19751975
"tencentcloud_organization_org_share_unit_member": tco.ResourceTencentCloudOrganizationOrgShareUnitMember(),
19761976
"tencentcloud_organization_org_share_unit": tco.ResourceTencentCloudOrganizationOrgShareUnit(),
1977-
"tencentcloud_kubernetes_addon": tke.ResourceTencentCloudKubernetesAddon()},
1977+
"tencentcloud_kubernetes_addon": tke.ResourceTencentCloudKubernetesAddon(),
1978+
"tencentcloud_kubernetes_native_node_pool": tke.ResourceTencentCloudKubernetesNativeNodePool()},
19781979

19791980
ConfigureFunc: providerConfigure,
19801981
}

‎tencentcloud/provider.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,7 @@ Tencent Kubernetes Engine(TKE)
657657
tencentcloud_kubernetes_cluster_node_pools
658658
tencentcloud_kubernetes_cluster_instances
659659
tencentcloud_kubernetes_cluster_node_pools
660+
tencentcloud_kubernetes_cluster_native_node_pools
660661

661662
Resource
662663
tencentcloud_kubernetes_cluster
@@ -670,6 +671,7 @@ Tencent Kubernetes Engine(TKE)
670671
tencentcloud_kubernetes_addon_attachment
671672
tencentcloud_kubernetes_cluster_endpoint
672673
tencentcloud_kubernetes_addon
674+
tencentcloud_kubernetes_native_node_pool
673675

674676
TDMQ for Pulsar(tpulsar)
675677
Data Source

0 commit comments

Comments
 (0)