Skip to content

Commit c0bf86b

Browse files
committed
add
1 parent 7a275c4 commit c0bf86b

File tree

2 files changed

+34
-8
lines changed

2 files changed

+34
-8
lines changed

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: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,14 @@ func resourceTencentCloudKubernetesNodePoolReadPostHandleResponse1(ctx context.C
307307
if _, ok := d.GetOk("cam_role_name"); ok || launchCfg.CamRoleName != nil {
308308
launchConfig["cam_role_name"] = launchCfg.CamRoleName
309309
}
310-
if launchCfg.InstanceNameSettings != nil && launchCfg.InstanceNameSettings.InstanceName != nil {
311-
launchConfig["instance_name"] = launchCfg.InstanceNameSettings.InstanceName
310+
if launchCfg.InstanceNameSettings != nil {
311+
if launchCfg.InstanceNameSettings.InstanceName != nil {
312+
launchConfig["instance_name"] = launchCfg.InstanceNameSettings.InstanceName
313+
}
314+
315+
if launchCfg.InstanceNameSettings.InstanceNameStyle != nil {
316+
launchConfig["instance_name_style"] = launchCfg.InstanceNameSettings.InstanceNameStyle
317+
}
312318
}
313319
if launchCfg.HostNameSettings != nil && launchCfg.HostNameSettings.HostName != nil {
314320
launchConfig["host_name"] = launchCfg.HostNameSettings.HostName
@@ -1015,10 +1021,17 @@ func composedKubernetesAsScalingConfigParaSerial(dMap map[string]interface{}, me
10151021
request.CamRoleName = helper.String(v.(string))
10161022
}
10171023

1024+
tmpInstanceNameSettings := &as.InstanceNameSettings{}
10181025
if v, ok := dMap["instance_name"]; ok && v != "" {
1019-
request.InstanceNameSettings = &as.InstanceNameSettings{
1020-
InstanceName: helper.String(v.(string)),
1021-
}
1026+
tmpInstanceNameSettings.InstanceName = helper.String(v.(string))
1027+
}
1028+
1029+
if v, ok := dMap["instance_name_style"]; ok && v != "" {
1030+
tmpInstanceNameSettings.InstanceNameStyle = helper.String(v.(string))
1031+
}
1032+
1033+
if tmpInstanceNameSettings.InstanceName != nil || tmpInstanceNameSettings.InstanceNameStyle != nil {
1034+
request.InstanceNameSettings = tmpInstanceNameSettings
10221035
}
10231036

10241037
if v, ok := dMap["host_name"]; ok && v != "" {
@@ -1169,10 +1182,17 @@ func composeAsLaunchConfigModifyRequest(d *schema.ResourceData, launchConfigId s
11691182
}
11701183
}
11711184

1185+
tmpInstanceNameSettings := &as.InstanceNameSettings{}
11721186
if v, ok := dMap["instance_name"]; ok && v != "" {
1173-
request.InstanceNameSettings = &as.InstanceNameSettings{
1174-
InstanceName: helper.String(v.(string)),
1175-
}
1187+
tmpInstanceNameSettings.InstanceName = helper.String(v.(string))
1188+
}
1189+
1190+
if v, ok := dMap["instance_name_style"]; ok && v != "" {
1191+
tmpInstanceNameSettings.InstanceNameStyle = helper.String(v.(string))
1192+
}
1193+
1194+
if tmpInstanceNameSettings.InstanceName != nil || tmpInstanceNameSettings.InstanceNameStyle != nil {
1195+
request.InstanceNameSettings = tmpInstanceNameSettings
11761196
}
11771197

11781198
if v, ok := dMap["host_name"]; ok && v != "" {

0 commit comments

Comments
 (0)