fix: desired cap

Author: Kagashino

tencentcloud/resource_tc_kubernetes_node_pool.go

@@ -215,17 +215,17 @@ func composedKubernetesAsScalingConfigPara() map[string]*schema.Schema {
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
 					"disk_type": {
-						Type:         schema.TypeString,
-						Optional:     true,
-						ForceNew:     true,
+						Type:     schema.TypeString,
+						Optional: true,
+						//ForceNew:     true,
 						Default:      SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
 						ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
 						Description:  "Types of disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`.",
 					},
 					"disk_size": {
-						Type:        schema.TypeInt,
-						Optional:    true,
-						ForceNew:    true,
+						Type:     schema.TypeInt,
+						Optional: true,
+						//ForceNew:    true,
 						Default:     0,
 						Description: "Volume of disk in GB. Default is `0`.",
 					},
@@ -897,6 +897,13 @@ func composeAsLaunchConfigModifyRequest(d *schema.ResourceData, launchConfigId s
 	return request
 }
 
+func desiredCapacityOutRange(d *schema.ResourceData) bool {
+	capacity := d.Get("desired_capacity").(int)
+	minSize := d.Get("min_size").(int)
+	maxSize := d.Get("max_size").(int)
+	return capacity > maxSize || capacity < minSize
+}
+
 func resourceKubernetesNodePoolRead(d *schema.ResourceData, meta interface{}) error {
 	defer logElapsed("resource.tencentcloud_kubernetes_node_pool.read")()
 
@@ -1265,6 +1272,27 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 		d.SetPartial("auto_scaling_config")
 	}
 
+	var capacityHasChanged = false
+	// assuming
+	// min 1 max 6 desired 2
+	// to
+	// min 3 max 6 desired 5
+	// modify min/max first will cause error, this case must upgrade desired first
+	if d.HasChange("desired_capacity") || !desiredCapacityOutRange(d) {
+		desiredCapacity := int64(d.Get("desired_capacity").(int))
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			errRet := service.ModifyClusterNodePoolDesiredCapacity(ctx, clusterId, nodePoolId, desiredCapacity)
+			if errRet != nil {
+				return retryError(errRet)
+			}
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+		capacityHasChanged = true
+	}
+
 	// ModifyClusterNodePool
 	if d.HasChange("min_size") || d.HasChange("max_size") || d.HasChange("name") || d.HasChange("labels") || d.HasChange("taints") || d.HasChange("enable_auto_scale") || d.HasChange("node_os_type") || d.HasChange("node_os") {
 		maxSize := int64(d.Get("max_size").(int))
@@ -1285,14 +1313,6 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 		if err != nil {
 			return err
 		}
-		d.SetPartial("min_size")
-		d.SetPartial("max_size")
-		d.SetPartial("name")
-		d.SetPartial("enable_auto_scale")
-		d.SetPartial("node_os")
-		d.SetPartial("node_os_type")
-		d.SetPartial("labels")
-		d.SetPartial("taints")
 	}
 
 	// ModifyScalingGroup
@@ -1361,7 +1381,7 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 		d.SetPartial("termination_policies")
 	}
 
-	if d.HasChange("desired_capacity") {
+	if d.HasChange("desired_capacity") && !capacityHasChanged {
 		desiredCapacity := int64(d.Get("desired_capacity").(int))
 		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 			errRet := service.ModifyClusterNodePoolDesiredCapacity(ctx, clusterId, nodePoolId, desiredCapacity)
@@ -1373,7 +1393,6 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 		if err != nil {
 			return err
 		}
-		d.SetPartial("desired_capacity")
 	}
 
 	if d.HasChange("auto_scaling_config.0.backup_instance_types") {

tencentcloud/resource_tc_kubernetes_node_pool_test.go

@@ -330,6 +330,12 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
     "test3" = "test3",
     "test2" = "test2",
   }
+  
+  taints {
+	key = "test_taint"
+    value = "taint_value"
+    effect = "PreferNoSchedule"
+  }
 
   node_config {
     extra_args = [

website/docs/r/kubernetes_node_pool.html.markdown

@@ -212,8 +212,8 @@ The `data_disk` object supports the following:
 The `data_disk` object supports the following:
 
 * `delete_with_instance` - (Optional, Bool) Indicates whether the disk remove after instance terminated.
-* `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
-* `disk_type` - (Optional, String, ForceNew) Types of disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`.
+* `disk_size` - (Optional, Int) Volume of disk in GB. Default is `0`.
+* `disk_type` - (Optional, String) Types of disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`.
 * `encrypt` - (Optional, Bool) Specify whether to encrypt data disk, default: false.
 * `snapshot_id` - (Optional, String, ForceNew) Data disk snapshot ID.
 * `throughput_performance` - (Optional, Int) Add extra performance to the data disk. Only works when disk type is `CLOUD_TSSD` or `CLOUD_HSSD` and `data_size` > 460GB.