Skip to content

Commit 30fbe9a

Browse files
committed
adjust name
1 parent 8ea1e1a commit 30fbe9a

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

tencentcloud/resource_tc_kubernetes_node_pool.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,16 @@ func composedKubernetesAsScalingConfigPara() map[string]*schema.Schema {
333333
"security_group_ids": {
334334
Type: schema.TypeSet,
335335
Optional: true,
336+
Computed:true,
336337
Elem: &schema.Schema{Type: schema.TypeString},
337-
ConflictsWith: []string{"auto_scaling_config.0.security_group_ids_orderly"},
338-
Deprecated: "This field of order cannot be guaranteed. Use `security_group_ids_orderly` instead.",
338+
ConflictsWith: []string{"auto_scaling_config.0.orderly_security_group_ids"},
339+
Deprecated: "This field of order cannot be guaranteed. Use `orderly_security_group_ids` instead.",
339340
Description: "Security groups to which a CVM instance belongs.",
340341
},
341-
"security_group_ids_orderly": {
342+
"orderly_security_group_ids": {
342343
Type: schema.TypeList,
343344
Optional: true,
345+
Computed:true,
344346
Elem: &schema.Schema{Type: schema.TypeString},
345347
ConflictsWith: []string{"auto_scaling_config.0.security_group_ids"},
346348
Description: "An ordered security groups to which a CVM instance belongs.",
@@ -776,7 +778,7 @@ func composedKubernetesAsScalingConfigParaSerial(dMap map[string]interface{}, me
776778
request.SecurityGroupIds = helper.InterfacesStringsPoint(v.(*schema.Set).List())
777779
}
778780

779-
if v, ok := dMap["security_group_ids_orderly"]; ok {
781+
if v, ok := dMap["orderly_security_group_ids"]; ok {
780782
request.SecurityGroupIds = helper.InterfacesStringsPoint(v.([]interface{}))
781783
}
782784

@@ -927,7 +929,7 @@ func composeAsLaunchConfigModifyRequest(d *schema.ResourceData, launchConfigId s
927929
request.SecurityGroupIds = helper.InterfacesStringsPoint(v.(*schema.Set).List())
928930
}
929931

930-
if v, ok := dMap["security_group_ids_orderly"]; ok {
932+
if v, ok := dMap["orderly_security_group_ids"]; ok {
931933
request.SecurityGroupIds = helper.InterfacesStringsPoint(v.([]interface{}))
932934
}
933935

@@ -1206,7 +1208,7 @@ func resourceKubernetesNodePoolRead(d *schema.ResourceData, meta interface{}) er
12061208

12071209
if launchCfg.SecurityGroupIds != nil {
12081210
launchConfig["security_group_ids"] = helper.StringsInterfaces(launchCfg.SecurityGroupIds)
1209-
launchConfig["security_group_ids_orderly"] = helper.StringsInterfaces(launchCfg.SecurityGroupIds)
1211+
launchConfig["orderly_security_group_ids"] = helper.StringsInterfaces(launchCfg.SecurityGroupIds)
12101212
}
12111213

12121214
enableSecurity := launchCfg.EnhancedService.SecurityService.Enabled

website/docs/r/kubernetes_node_pool.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ The `auto_scaling_config` object supports the following:
201201
* `internet_charge_type` - (Optional, String) Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.
202202
* `internet_max_bandwidth_out` - (Optional, Int) Max bandwidth of Internet access in Mbps. Default is `0`.
203203
* `key_ids` - (Optional, List, ForceNew) ID list of keys.
204+
* `orderly_security_group_ids` - (Optional, List) An ordered security groups to which a CVM instance belongs.
204205
* `password` - (Optional, String, ForceNew) Password to access.
205206
* `public_ip_assigned` - (Optional, Bool) Specify whether to assign an Internet IP address.
206-
* `security_group_ids_orderly` - (Optional, List) An ordered security groups to which a CVM instance belongs.
207207
* `security_group_ids` - (Optional, Set) Security groups to which a CVM instance belongs.
208208
* `spot_instance_type` - (Optional, String) Type of spot instance, only support `one-time` now. Note: it only works when instance_charge_type is set to `SPOTPAID`.
209209
* `spot_max_price` - (Optional, String) Max price of a spot instance, is the format of decimal string, for example "0.50". Note: it only works when instance_charge_type is set to `SPOTPAID`.

0 commit comments

Comments
 (0)