Skip to content

Commit b3377f3

Browse files
authored
fix(tke): [127894479] tencentcloud_kubernetes_node_pool support ipv4_address_type (#3569)
* add * add * add
1 parent b4c9e78 commit b3377f3

File tree

9 files changed

+67
-16
lines changed

9 files changed

+67
-16
lines changed

.changelog/3569.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_kubernetes_node_pool: support `ipv4_address_type`
3+
```

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/api v1.0.285
3131
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway v1.0.763
3232
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825
33-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.1.4
33+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.1.21
3434
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.1.27
3636
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.825

go.sum

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825 h1:yiC2lsZ
829829
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825/go.mod h1:6qtSa8OZKwJOWoOCYWVZd6+T62O96AxbPll0I43d4yw=
830830
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.1.4 h1:9EguBiOzGyfCm4ZlO4QnnsZf/kpyTWS6DHz3bse9lNY=
831831
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.1.4/go.mod h1:jUF68ck1rxCqXkdmYRT2B2GtLrXAxmp7T0CcyWZ8BbM=
832+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.1.21 h1:Y1miKK/dhfGn3AtCXMFDE3+kOUXyJMUnVlHCGC6EKSw=
833+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.1.21/go.mod h1:JqVqVFUzcEVksJT1WNRUsRQPgyfLSpJ8C0PxnTXinuY=
832834
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824 h1:DVKvZ6h+qd7tadUrCjVAkCCmE3TsbK2ZmwGd3AJcpWc=
833835
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824/go.mod h1:DvBpDX/qdJG4KKLeULmRvhAjPYiw8za0HeTSu2y/lFw=
834836
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/billing v1.1.0 h1:tfTh+fIqYPgWV2wi4oDvG963pi8tljtZ+5OdnhEqRnU=
@@ -941,6 +943,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.5/go.mod h1
941943
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.7/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
942944
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.13/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
943945
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.14/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
946+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.21/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
944947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.22 h1:1unTmvNXynDN0mOZSWh9tL5Wp9Rb5paMGwFvua+HHoI=
945948
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.22/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
946949
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.23 h1:YZOxepoaH/yNaD1sYpCXR6PuFd22hbKdlXAGXWre8aM=

tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tencentcloud/services/tke/resource_tc_kubernetes_node_pool_extension.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,9 @@ func resourceTencentCloudKubernetesNodePoolReadPostHandleResponse1(ctx context.C
261261
if launchCfg.InternetAccessible.PublicIpAssigned != nil {
262262
launchConfig["public_ip_assigned"] = launchCfg.InternetAccessible.PublicIpAssigned
263263
}
264+
if launchCfg.InternetAccessible.IPv4AddressType != nil {
265+
launchConfig["ipv4_address_type"] = launchCfg.InternetAccessible.IPv4AddressType
266+
}
264267
if launchCfg.InstanceChargeType != nil {
265268
launchConfig["instance_charge_type"] = launchCfg.InstanceChargeType
266269
if *launchCfg.InstanceChargeType == svcas.INSTANCE_CHARGE_TYPE_SPOTPAID && launchCfg.InstanceMarketOptions != nil {
@@ -1012,6 +1015,10 @@ func composedKubernetesAsScalingConfigParaSerial(dMap map[string]interface{}, me
10121015
publicIpAssigned := v.(bool)
10131016
request.InternetAccessible.PublicIpAssigned = &publicIpAssigned
10141017
}
1018+
if v, ok := dMap["ipv4_address_type"]; ok && v != "" {
1019+
ipv4AddressType := v.(string)
1020+
request.InternetAccessible.IPv4AddressType = &ipv4AddressType
1021+
}
10151022

10161023
request.LoginSettings = &as.LoginSettings{}
10171024

@@ -1222,6 +1229,10 @@ func composeAsLaunchConfigModifyRequest(d *schema.ResourceData, launchConfigId s
12221229
publicIpAssigned := v.(bool)
12231230
request.InternetAccessible.PublicIpAssigned = &publicIpAssigned
12241231
}
1232+
if v, ok := dMap["ipv4_address_type"]; ok && v != "" {
1233+
ipv4AddressType := v.(string)
1234+
request.InternetAccessible.IPv4AddressType = &ipv4AddressType
1235+
}
12251236

12261237
if d.HasChange("auto_scaling_config.0.security_group_ids") {
12271238
if v, ok := dMap["security_group_ids"]; ok {

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419/client.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419/models.go

Lines changed: 39 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)