Merge pull request #675 from tencentcloudstack/feat/nodepool-asg-edit

feat: tke cluster node pool - extend auto scaling group partial params

Author: Kagashino

tencentcloud/resource_tc_kubernetes_node_pool.go

@@ -410,6 +410,36 @@ func ResourceTencentCloudKubernetesNodePool() *schema.Resource {
 				Default:     "GENERAL",
 				Description: "The image version of the node. Valida values are `DOCKER_CUSTOMIZE` and `GENERAL`. Default is `GENERAL`. This parameter will only affect new nodes, not including the existing nodes.",
 			},
+			// asg pass through arguments
+			"scaling_group_name": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Name of relative scaling group.",
+			},
+			"zones": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Description: "List of auto scaling group available zones, for Basic network it is required.",
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
+			"scaling_group_project_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Default:     0,
+				Description: "Project ID the scaling group belongs to.",
+			},
+			"default_cooldown": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "Seconds of scaling group cool down. Default value is `300`.",
+			},
+			"termination_policies": {
+				Type:        schema.TypeList,
+				MaxItems:    1,
+				Optional:    true,
+				Description: "Policy of scaling group termination. Available values: `[\"OLDEST_INSTANCE\"]`, `[\"NEWEST_INSTANCE\"]`.",
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
 			//computed
 			"status": {
 				Type:        schema.TypeString,
@@ -609,6 +639,7 @@ func resourceKubernetesNodePoolRead(d *schema.ResourceData, meta interface{}) er
 		logId   = getLogId(contextNil)
 		ctx     = context.WithValue(context.TODO(), logIdKey, logId)
 		service = TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
+		asService = AsService{client: meta.(*TencentCloudClient).apiV3Conn}
 		items   = strings.Split(d.Id(), FILED_SP)
 	)
 	if len(items) != 2 {
@@ -678,6 +709,30 @@ func resourceKubernetesNodePoolRead(d *schema.ResourceData, meta interface{}) er
 	}
 	d.Set("labels", lables)
 
+	// Relative scaling group status
+	asg, hasAsg, err := asService.DescribeAutoScalingGroupById(ctx, *nodePool.AutoscalingGroupId)
+	if err != nil {
+		err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+			asg, hasAsg, err = asService.DescribeAutoScalingGroupById(ctx, *nodePool.AutoscalingGroupId)
+			if err != nil {
+				return retryError(err)
+			}
+			return nil
+		})
+	}
+
+	if err != nil {
+		return nil
+	}
+
+	if hasAsg >= 1 {
+		_ = d.Set("scaling_group_name", asg.AutoScalingGroupName)
+		_ = d.Set("zones", asg.ZoneSet)
+		_ = d.Set("scaling_group_project_id", asg.ProjectId)
+		_ = d.Set("default_cooldown", asg.DefaultCooldown)
+		_ = d.Set("termination_policies", asg.TerminationPolicySet)
+	}
+
 	taints := make([]map[string]interface{}, len(nodePool.Taints))
 	for i, v := range nodePool.Taints {
 		taint := map[string]interface{}{
@@ -797,6 +852,7 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 		logId   = getLogId(contextNil)
 		ctx     = context.WithValue(context.TODO(), logIdKey, logId)
 		service = TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
+		asService = AsService{client: meta.(*TencentCloudClient).apiV3Conn}
 		items   = strings.Split(d.Id(), FILED_SP)
 	)
 	if len(items) != 2 {
@@ -836,6 +892,57 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 		d.SetPartial("taints")
 	}
 
+	if d.HasChange("scaling_group_name") ||
+		d.HasChange("zones") ||
+		d.HasChange("scaling_group_project_id") ||
+		d.HasChange("default_cooldown") ||
+		d.HasChange("termination_policies") {
+
+		nodePool, _, err := service.DescribeNodePool(ctx, clusterId, nodePoolId)
+		if err != nil {
+			return err
+		}
+
+		var (
+			scalingGroupId	  = *nodePool.AutoscalingGroupId
+			name              = d.Get("scaling_group_name").(string)
+			projectId		  = d.Get("scaling_group_project_id").(int)
+			defaultCooldown   = d.Get("default_cooldown").(int)
+			zones             []*string
+			terminationPolicy []*string
+		)
+
+		if v, ok := d.GetOk("zones"); ok {
+			for _, zone := range v.([]interface{}) {
+				zones = append(zones, helper.String(zone.(string)))
+			}
+		}
+
+		if v, ok := d.GetOk("termination_policy"); ok {
+			for _, policy := range v.([]interface{}) {
+				terminationPolicy = append(terminationPolicy, helper.String(policy.(string)))
+			}
+		}
+
+
+		err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			errRet := asService.ModifyScalingGroup(ctx, scalingGroupId, name, projectId, defaultCooldown, zones, terminationPolicy)
+			if errRet != nil {
+				return retryError(errRet)
+			}
+			return nil
+		})
+
+		if err != nil {
+			return err
+		}
+		d.SetPartial("scaling_group_name")
+		d.SetPartial("zones")
+		d.SetPartial("scaling_group_project_id")
+		d.SetPartial("default_cooldown")
+		d.SetPartial("termination_policies")
+	}
+
 	if d.HasChange("desired_capacity") {
 		desiredCapacity := int64(d.Get("desired_capacity").(int))
 		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {

tencentcloud/resource_tc_kubernetes_node_pool_test.go

@@ -34,6 +34,10 @@ func TestAccTencentCloudTkeNodePoolResource(t *testing.T) {
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "desired_capacity", "1"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "name", "mynodepool"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "unschedulable", "0"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "scaling_group_name", "basic_group"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "default_cooldown", "400"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "termination_policies.#", "1"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "termination_policies.0", "OLDEST_INSTANCE"),
 				),
 			},
 			{
@@ -50,6 +54,10 @@ func TestAccTencentCloudTkeNodePoolResource(t *testing.T) {
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "name", "mynodepoolupdate"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "node_os", "ubuntu18.04.1x86_64"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "unschedulable", "1"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "scaling_group_name", "basic_group_test"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "default_cooldown", "350"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "termination_policies.#", "1"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "termination_policies.0", "NEWEST_INSTANCE"),
 				),
 			},
 		},
@@ -189,6 +197,9 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
   retry_policy         = "INCREMENTAL_INTERVALS"
   desired_capacity     = 1
   enable_auto_scale    = true
+  scaling_group_name	   = "basic_group"
+  default_cooldown		   = 400
+  termination_policies	   = ["OLDEST_INSTANCE"]
 
   auto_scaling_config {
     instance_type      = var.default_instance_type
@@ -222,9 +233,9 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
   }
 
   node_config {
-      extra_args = [
- 	"root-dir=/var/lib/kubelet"
-  ]
+    extra_args = [
+      "root-dir=/var/lib/kubelet"
+    ]
   }
 }
 
@@ -243,6 +254,9 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
   enable_auto_scale    = false
   node_os = "ubuntu18.04.1x86_64"
   delete_keep_instance = true
+  scaling_group_name 	   = "basic_group_test"
+  default_cooldown 		   = 350
+  termination_policies 	   = ["NEWEST_INSTANCE"]
 
   auto_scaling_config {
     instance_type      = var.default_instance_type
@@ -270,9 +284,9 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
   }
 
   node_config {
-      extra_args = [
- 	"root-dir=/var/lib/kubelet"
-  ]
+    extra_args = [
+      "root-dir=/var/lib/kubelet"
+    ]
   }
 }
 `

tencentcloud/service_tencentcloud_as.go

@@ -440,6 +440,42 @@ func (me *AsService) DescribeScheduledActionById(ctx context.Context, scheduledA
 	return
 }
 
+func (me *AsService) ModifyScalingGroup(ctx context.Context, id string, name string, projectId int, cooldown int, zones []*string, terminatePolicy []*string) error {
+	logId := getLogId(ctx)
+	request := as.NewModifyAutoScalingGroupRequest()
+
+	request.AutoScalingGroupId = helper.String(id)
+
+	if name != "" {
+		request.AutoScalingGroupName = helper.String(name)
+	}
+
+	if projectId != 0 {
+		request.ProjectId = helper.IntUint64(projectId)
+	}
+
+	if cooldown != 0 {
+		request.DefaultCooldown = helper.IntUint64(cooldown)
+	}
+
+	if len(zones) != 0 {
+		request.Zones = zones
+	}
+
+	if len(terminatePolicy) != 0 {
+		request.TerminationPolicies = terminatePolicy[:1]
+	}
+
+	ratelimit.Check(request.GetAction())
+	_, err := me.client.UseAsClient().ModifyAutoScalingGroup(request)
+	if err != nil {
+		log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+			logId, request.GetAction(), request.ToJsonString(), err.Error())
+		return err
+	}
+	return nil
+}
+
 func (me *AsService) DeleteScheduledAction(ctx context.Context, scheduledActonId string) error {
 	logId := getLogId(ctx)
 	request := as.NewDeleteScheduledActionRequest()

website/docs/r/kubernetes_node_pool.html.markdown

@@ -112,6 +112,7 @@ The following arguments are supported:
 * `min_size` - (Required) Minimum number of node.
 * `name` - (Required, ForceNew) Name of the node pool. The name does not exceed 25 characters, and only supports Chinese, English, numbers, underscores, separators (`-`) and decimal points.
 * `vpc_id` - (Required, ForceNew) ID of VPC network.
+* `default_cooldown` - (Optional) Seconds of scaling group cool down. Default value is `300`.
 * `delete_keep_instance` - (Optional) Indicate to keep the CVM instance when delete the node pool. Default is `true`.
 * `desired_capacity` - (Optional) Desired capacity ot the node. If `enable_auto_scale` is set `true`, this will be a computed parameter.
 * `enable_auto_scale` - (Optional) Indicate whether to enable auto scaling or not.
@@ -120,10 +121,14 @@ The following arguments are supported:
 * `node_os_type` - (Optional) The image version of the node. Valida values are `DOCKER_CUSTOMIZE` and `GENERAL`. Default is `GENERAL`. This parameter will only affect new nodes, not including the existing nodes.
 * `node_os` - (Optional) Operating system of the cluster, the available values include: `tlinux2.4x86_64`, `ubuntu18.04.1x86_64`, `ubuntu16.04.1 LTSx86_64`, `centos7.6.0_x64` and `centos7.2x86_64`. Default is 'tlinux2.4x86_64'. This parameter will only affect new nodes, not including the existing nodes.
 * `retry_policy` - (Optional, ForceNew) Available values for retry policies include `IMMEDIATE_RETRY` and `INCREMENTAL_INTERVALS`.
+* `scaling_group_name` - (Optional) Name of relative scaling group.
+* `scaling_group_project_id` - (Optional) Project ID the scaling group belongs to.
 * `scaling_mode` - (Optional, ForceNew) Auto scaling mode. Valid values are `CLASSIC_SCALING`(scaling by create/destroy instances), `WAKE_UP_STOPPED_SCALING`(Boot priority for expansion. When expanding the capacity, the shutdown operation is given priority to the shutdown of the instance. If the number of instances is still lower than the expected number of instances after the startup, the instance will be created, and the method of destroying the instance will still be used for shrinking).
 * `subnet_ids` - (Optional, ForceNew) ID list of subnet, and for VPC it is required.
 * `taints` - (Optional) Taints of kubernetes node pool created nodes.
+* `termination_policies` - (Optional) Policy of scaling group termination. Available values: `["OLDEST_INSTANCE"]`, `["NEWEST_INSTANCE"]`.
 * `unschedulable` - (Optional, ForceNew) Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.
+* `zones` - (Optional) List of auto scaling group available zones, for Basic network it is required.
 
 The `auto_scaling_config` object supports the following: