fix: nodepool support tag specifications (#1317)

* fix: nodepool support tag specifications

* changelog 1317

Author: Kagashino

.changelog/1317.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_kubernetes_node_pool: Support tag specifications 
+```

tencentcloud/resource_tc_kubernetes_node_pool.go

@@ -559,6 +559,11 @@ func ResourceTencentCloudKubernetesNodePool() *schema.Resource {
 				Description: "Policy of scaling group termination. Available values: `[\"OLDEST_INSTANCE\"]`, `[\"NEWEST_INSTANCE\"]`.",
 				Elem:        &schema.Schema{Type: schema.TypeString},
 			},
+			"tags": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Description: "Node pool tag specifications, will passthroughs to the scaling instances.",
+			},
 			//computed
 			"status": {
 				Type:        schema.TypeString,
@@ -1031,6 +1036,15 @@ func resourceKubernetesNodePoolRead(d *schema.ResourceData, meta interface{}) er
 		_ = d.Set("node_os_type", nodePool.OsCustomizeType)
 	}
 
+	if tags := nodePool.Tags; tags != nil {
+		tagMap := make(map[string]string)
+		for i := range tags {
+			tag := tags[i]
+			tagMap[*tag.Key] = *tag.Value
+		}
+		_ = d.Set("tags", tagMap)
+	}
+
 	//if nodePool.DeletionProtection != nil {
 	//	_ = d.Set("deletion_protection", nodePool.DeletionProtection)
 	//}
@@ -1358,8 +1372,9 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 		nodeOsType := d.Get("node_os_type").(string)
 		labels := GetTkeLabels(d, "labels")
 		taints := GetTkeTaints(d, "taints")
+		tags := helper.GetTags(d, "tags")
 		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-			errRet := service.ModifyClusterNodePool(ctx, clusterId, nodePoolId, name, enableAutoScale, minSize, maxSize, nodeOs, nodeOsType, labels, taints)
+			errRet := service.ModifyClusterNodePool(ctx, clusterId, nodePoolId, name, enableAutoScale, minSize, maxSize, nodeOs, nodeOsType, labels, taints, tags)
 			if errRet != nil {
 				return retryError(errRet)
 			}

tencentcloud/resource_tc_kubernetes_node_pool_test.go

@@ -101,6 +101,8 @@ func TestAccTencentCloudTkeNodePoolResourceBasic(t *testing.T) {
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "node_count", "1"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "autoscaling_added_total", "1"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "manually_added_total", "0"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "tags.keep-test-np1", "test1"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "tags.keep-test-np2", "test2"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "auto_scaling_config.0.security_group_ids.#", "1"),
 				),
 			},
@@ -131,6 +133,8 @@ func TestAccTencentCloudTkeNodePoolResourceBasic(t *testing.T) {
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "default_cooldown", "350"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "termination_policies.#", "1"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "termination_policies.0", "NEWEST_INSTANCE"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "tags.keep-test-np1", "testI"),
+					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "tags.keep-test-np3", "testIII"),
 					resource.TestCheckResourceAttr(testTkeClusterNodePoolResourceKey, "auto_scaling_config.0.security_group_ids.#", "2"),
 				),
 			},
@@ -298,6 +302,11 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
     effect = "PreferNoSchedule"
   }
 
+  tags = {
+    keep-test-np1 = "test1"
+    keep-test-np2 = "test2"
+  }
+
   node_config {
     extra_args = [
       "root-dir=/var/lib/kubelet"
@@ -366,6 +375,11 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
     effect = "PreferNoSchedule"
   }
 
+  tags = {
+    keep-test-np1 = "testI"
+    keep-test-np3 = "testIII"
+  }
+
   node_config {
     extra_args = [
       "root-dir=/var/lib/kubelet"

tencentcloud/service_tencentcloud_tke.go

@@ -1215,7 +1215,7 @@ func (me *TkeService) CreateClusterNodePool(ctx context.Context, clusterId, name
 	return
 }
 
-func (me *TkeService) ModifyClusterNodePool(ctx context.Context, clusterId, nodePoolId string, name string, enableAutoScale bool, minSize int64, maxSize int64, nodeOs string, nodeOsType string, labels []*tke.Label, taints []*tke.Taint) (errRet error) {
+func (me *TkeService) ModifyClusterNodePool(ctx context.Context, clusterId, nodePoolId string, name string, enableAutoScale bool, minSize int64, maxSize int64, nodeOs string, nodeOsType string, labels []*tke.Label, taints []*tke.Taint, tags map[string]string) (errRet error) {
 	logId := getLogId(ctx)
 	request := tke.NewModifyClusterNodePoolRequest()
 
@@ -1240,6 +1240,17 @@ func (me *TkeService) ModifyClusterNodePool(ctx context.Context, clusterId, node
 		request.Labels = labels
 	}
 
+	if len(tags) > 0 {
+		for k, v := range tags {
+			key := k
+			val := v
+			request.Tags = append(request.Tags, &tke.Tag{
+				Key:   &key,
+				Value: &val,
+			})
+		}
+	}
+
 	ratelimit.Check(request.GetAction())
 	_, err := me.client.UseTkeClient().ModifyClusterNodePool(request)
 	if err != nil {

website/docs/r/kubernetes_node_pool.html.markdown

@@ -172,6 +172,7 @@ The following arguments are supported:
 * `scaling_group_project_id` - (Optional, Int) Project ID the scaling group belongs to.
 * `scaling_mode` - (Optional, String, 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, List: [`String`], ForceNew) ID list of subnet, and for VPC it is required.
+* `tags` - (Optional, Map) Node pool tag specifications, will passthroughs to the scaling instances.
 * `taints` - (Optional, List) Taints of kubernetes node pool created nodes.
 * `termination_policies` - (Optional, List: [`String`]) Policy of scaling group termination. Available values: `["OLDEST_INSTANCE"]`, `["NEWEST_INSTANCE"]`.
 * `unschedulable` - (Optional, Int, ForceNew) Sets whether the joining node participates in the schedule. Default is '0'. Participate in scheduling.