Skip to content

Commit a70f66d

Browse files
SevenEarthSevenEarth
authored
fix(tke): [121025014] tencentcloud_kubernetes_node_pool add auto_update_instance_tags params (#2991)
* add * add * add
1 parent d14ba0f commit a70f66d

File tree

9 files changed

+44
-12
lines changed

9 files changed

+44
-12
lines changed

‎.changelog/2991.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: add `auto_update_instance_tags` params
3+
```

‎go.mod‎

Lines changed: 2 additions & 2 deletions
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.0.1050
33+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1052
3434
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.1051
3636
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.825
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1034
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1046
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1051
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1052
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1014
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825 h1:yiC2lsZ
828828
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825/go.mod h1:6qtSa8OZKwJOWoOCYWVZd6+T62O96AxbPll0I43d4yw=
829829
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1050 h1:uLV7suHZzLYQ7FzzPotAxHp8U2Cyu79Q9+DjHfGBS1o=
830830
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1050/go.mod h1:z8L5Brgaqaq9DK0p8wzOB+6alOD/qWABzkCFmitewAE=
831+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1052 h1:d7eK/iFBAL1P75UWcc+wupp2/W1KQHdTxB/YpJTaoUA=
832+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1052/go.mod h1:o/8YQckpRRJ12COW2g9J9Fx+v5noOAsHkKVQpTctM+g=
831833
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824 h1:DVKvZ6h+qd7tadUrCjVAkCCmE3TsbK2ZmwGd3AJcpWc=
832834
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824/go.mod h1:DvBpDX/qdJG4KKLeULmRvhAjPYiw8za0HeTSu2y/lFw=
833835
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.1051 h1:ZwWmhAxXd88JDPs/8s2qW9SJblXNhIXWKWfeW7jtjlc=
@@ -930,6 +932,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1046/go.mod
930932
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1050/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
931933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1051 h1:3mg0L9vv9eO8UN4Oa7vNawe6yUIuXf9D0Q79rUmnblo=
932934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1051/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
935+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1052 h1:RCs8aH5Gy1sn4qc22KweqQE7usx1S2reyZcedo0ZXBI=
936+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1052/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
933937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
934938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
935939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=

‎tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go‎

Lines changed: 8 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: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,11 @@ func resourceTencentCloudKubernetesNodePoolReadPostHandleResponse1(ctx context.C
479479
_ = d.Set("scaling_mode", v.(string))
480480
}
481481
}
482+
483+
if asg.ServiceSettings != nil && asg.ServiceSettings.AutoUpdateInstanceTags != nil {
484+
_ = d.Set("auto_update_instance_tags", asg.ServiceSettings.AutoUpdateInstanceTags)
485+
}
486+
482487
// If not check, the diff between computed and default empty value leads to force replacement
483488
if _, ok := d.GetOk("multi_zone_subnet_policy"); ok {
484489
_ = d.Set("multi_zone_subnet_policy", asg.MultiZoneSubnetPolicy)
@@ -891,8 +896,15 @@ func composeParameterToAsScalingGroupParaSerial(d *schema.ResourceData) (string,
891896
request.SubnetIds = helper.InterfacesStringsPoint(subnetIds)
892897
}
893898

899+
asServiceSettings := as.ServiceSettings{}
894900
if v, ok := d.GetOk("scaling_mode"); ok {
895-
request.ServiceSettings = &as.ServiceSettings{ScalingMode: helper.String(v.(string))}
901+
asServiceSettings.ScalingMode = helper.String(v.(string))
902+
request.ServiceSettings = &asServiceSettings
903+
}
904+
905+
if v, ok := d.GetOkExists("auto_update_instance_tags"); ok {
906+
asServiceSettings.AutoUpdateInstanceTags = helper.Bool(v.(bool))
907+
request.ServiceSettings = &asServiceSettings
896908
}
897909

898910
if v, ok := d.GetOk("multi_zone_subnet_policy"); ok {

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

Lines changed: 10 additions & 6 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/common/http/request.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway/v20180808
11061106
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm v1.0.825
11071107
## explicit; go 1.14
11081108
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apm/v20210622
1109-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1050
1109+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.1052
11101110
## explicit; go 1.14
11111111
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419
11121112
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/bi v1.0.824
@@ -1163,7 +1163,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
11631163
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1046
11641164
## explicit; go 1.14
11651165
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
1166-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1051
1166+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1052
11671167
## explicit; go 1.11
11681168
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
11691169
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors

‎website/docs/r/kubernetes_node_pool.html.markdown‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ The following arguments are supported:
234234
* `name` - (Required, String) Name of the node pool. The name does not exceed 25 characters, and only supports Chinese, English, numbers, underscores, separators (`-`) and decimal points.
235235
* `vpc_id` - (Required, String, ForceNew) ID of VPC network.
236236
* `annotations` - (Optional, Set) Node Annotation List.
237+
* `auto_update_instance_tags` - (Optional, Bool, ForceNew) Automatically update instance tags. The default value is false. After configuration, if the scaling group tags are updated, the tags of the running instances in the scaling group will be updated synchronously (synchronous updates only support adding and modifying tags, and do not support deleting tags for the time being). Synchronous updates do not take effect immediately and there is a certain delay.
237238
* `default_cooldown` - (Optional, Int) Seconds of scaling group cool down. Default value is `300`.
238239
* `delete_keep_instance` - (Optional, Bool) Indicate to keep the CVM instance when delete the node pool. Default is `true`.
239240
* `deletion_protection` - (Optional, Bool) Indicates whether the node pool deletion protection is enabled.

0 commit comments

Comments
 (0)