Skip to content

Commit 8b68d91

Browse files
committed
misc: tke node pool
1 parent 820cddd commit 8b68d91

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.changelog/1545.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
```release-note:enhancement
2-
resource/tencentcloud_kubernetes_node_pool: adjust enhanced_security_service to not forceNew.
2+
resource/tencentcloud_kubernetes_node_pool: adjust enhanced_security_service to not forceNew
33
```

tencentcloud/service_tencentcloud_tke.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2391,7 +2391,6 @@ func (me *TkeService) ModifyClusterVirtualNodePool(ctx context.Context, request
23912391
return
23922392
}
23932393

2394-
<<<<<<< HEAD
23952394
func (me *TkeService) DescribeClusterVirtualNode(ctx context.Context, clusterId string) (virtualNodes []tke.VirtualNode, errRet error) {
23962395
logId := getLogId(ctx)
23972396

@@ -2442,8 +2441,14 @@ func ModifySecurityServiceOfCvmInNodePool(ctx context.Context, d *schema.Resourc
24422441
}
24432442

24442443
const BatchProcessedInsLimit = 100 // limit 100 items to change each request
2445-
launchConfigRaw := d.Get("auto_scaling_config").([]interface{})
2446-
dMap := launchConfigRaw[0].(map[string]interface{})
2444+
var (
2445+
launchConfigRaw []interface{}
2446+
dMap map[string]interface{}
2447+
)
2448+
if raw, ok := d.GetOk("auto_scaling_config"); ok {
2449+
launchConfigRaw = raw.([]interface{})
2450+
dMap = launchConfigRaw[0].(map[string]interface{})
2451+
}
24472452

24482453
if v, ok := dMap["enhanced_security_service"]; ok && !v.(bool) {
24492454
// uninstall, cwp/DeleteMachine, need uuid

0 commit comments

Comments
 (0)