Merge branch 'master' into master

Author: gailwang

CHANGELOG.md

@@ -9,6 +9,7 @@ ENHANCEMENTS:
 * Resource: `tencentcloud_clb_redirection` add new argument `delete_all_auto_rewirte` to delete all auto-associated redirection when destroying the resource.
 * Data Source: `tencentcloud_kubernetes_clusters` add new argument `kube_config`.
 * Data Source: `tencentcloud_availability_regions` support getting local region info by setting argument `name` with value `default`.
+* Resource: `tencentcloud_kubernetes_scale_worker` add new argument `labels` to support scale worker labels.
 
 BUG FIXES:
 

tencentcloud/resource_tc_kubernetes_scale_worker.go

@@ -20,7 +20,10 @@ variable "scale_instance_type" {
 
 resource tencentcloud_kubernetes_scale_worker test_scale {
   cluster_id = "cls-godovr32"
-
+  labels = {
+    "test1" = "test1",
+    "test2" = "test2",
+  }
   worker_config {
     count                      = 3
     availability_zone          = var.availability_zone
@@ -67,6 +70,11 @@ resource tencentcloud_kubernetes_scale_worker test_scale {
  	"root-dir=/var/lib/kubelet"
   ]
 
+   labels = {
+    "test1" = "test1",
+    "test2" = "test2",
+  }
+
   worker_config {
     count                      = 3
     availability_zone          = var.availability_zone
@@ -129,6 +137,12 @@ func resourceTencentCloudTkeScaleWorker() *schema.Resource {
 				},
 				Description: "Deploy the machine configuration information of the 'WORK' service, and create <=20 units for common users.",
 			},
+			"labels": {
+				Type:        schema.TypeMap,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "Labels of kubernetes scale worker created nodes.",
+			},
 			"extra_args": {
 				Type:        schema.TypeList,
 				Optional:    true,
@@ -196,6 +210,8 @@ func resourceTencentCloudTkeScaleWorkerCreate(d *schema.ResourceData, meta inter
 		}
 	}
 
+	iAdvanced.Labels = GetTkeLabels(d, "labels")
+
 	if temp, ok := d.GetOk("extra_args"); ok {
 		extraArgs := helper.InterfacesStrings(temp.([]interface{}))
 		for _, extraArg := range extraArgs {
@@ -328,7 +344,7 @@ func resourceTencentCloudTkeScaleWorkerRead(d *schema.ResourceData, meta interfa
 	}
 
 	newWorkerInstancesList := make([]map[string]interface{}, 0, len(workers))
-
+	newWorkerLabelList := make([]map[string]string, 0, len(workers))
 	for _, cvm := range workers {
 		if _, ok := instanceMap[cvm.InstanceId]; !ok {
 			continue
@@ -339,6 +355,13 @@ func resourceTencentCloudTkeScaleWorkerRead(d *schema.ResourceData, meta interfa
 		tempMap["instance_state"] = cvm.InstanceState
 		tempMap["failed_reason"] = cvm.FailedReason
 		newWorkerInstancesList = append(newWorkerInstancesList, tempMap)
+
+		labels := cvm.InstanceAdvancedSettings.Labels
+		var labelsMap = make(map[string]string, len(labels))
+		for _, v := range labels {
+			labelsMap[*v.Name] = *v.Value
+		}
+		newWorkerLabelList = append(newWorkerLabelList, labelsMap)
 	}
 
 	// The machines I generated was deleted by others.
@@ -347,6 +370,7 @@ func resourceTencentCloudTkeScaleWorkerRead(d *schema.ResourceData, meta interfa
 		return nil
 	}
 
+	_ = d.Set("labels", newWorkerLabelList)
 	return d.Set("worker_instances_list", newWorkerInstancesList)
 }
 func resourceTencentCloudTkeScaleWorkerDelete(d *schema.ResourceData, meta interface{}) error {

tencentcloud/resource_tc_kubernetes_scale_worker_test.go

@@ -189,6 +189,11 @@ resource tencentcloud_kubernetes_scale_worker test_scale {
  	"root-dir=/var/lib/kubelet"
   ]	
 
+  labels = {
+    "test1" = "test1",
+    "test2" = "test2",
+  }
+
   worker_config {
     count                      				= 1
     availability_zone          				= var.availability_zone

tencentcloud/service_tencentcloud_tke.go

@@ -79,10 +79,11 @@ type ClusterInfo struct {
 }
 
 type InstanceInfo struct {
-	InstanceId    string
-	InstanceRole  string
-	InstanceState string
-	FailedReason  string
+	InstanceId               string
+	InstanceRole             string
+	InstanceState            string
+	FailedReason             string
+	InstanceAdvancedSettings *tke.InstanceAdvancedSettings
 }
 
 type TkeService struct {
@@ -138,10 +139,11 @@ getMoreData:
 		}
 		has[*item.InstanceId] = true
 		instanceInfo := InstanceInfo{
-			InstanceId:    *item.InstanceId,
-			InstanceRole:  *item.InstanceRole,
-			InstanceState: *item.InstanceState,
-			FailedReason:  *item.FailedReason,
+			InstanceId:               *item.InstanceId,
+			InstanceRole:             *item.InstanceRole,
+			InstanceState:            *item.InstanceState,
+			FailedReason:             *item.FailedReason,
+			InstanceAdvancedSettings: item.InstanceAdvancedSettings,
 		}
 		if instanceInfo.InstanceRole == TKE_ROLE_WORKER {
 			workers = append(workers, instanceInfo)
@@ -463,6 +465,7 @@ func (me *TkeService) CreateClusterInstances(ctx context.Context,
 	if len(iAdvanced.ExtraArgs.Kubelet) > 0 {
 		request.InstanceAdvancedSettings.ExtraArgs = &iAdvanced.ExtraArgs
 	}
+	request.InstanceAdvancedSettings.Labels = iAdvanced.Labels
 
 	ratelimit.Check(request.GetAction())
 	response, err := me.client.UseTkeClient().CreateClusterInstances(request)

website/docs/r/kubernetes_scale_worker.html.markdown

@@ -30,7 +30,10 @@ variable "scale_instance_type" {
 
 resource tencentcloud_kubernetes_scale_worker test_scale {
   cluster_id = "cls-godovr32"
-
+  labels = {
+    "test1" = "test1",
+    "test2" = "test2",
+  }
   worker_config {
     count                      = 3
     availability_zone          = var.availability_zone
@@ -77,6 +80,11 @@ resource tencentcloud_kubernetes_scale_worker test_scale {
     "root-dir=/var/lib/kubelet"
   ]
 
+  labels = {
+    "test1" = "test1",
+    "test2" = "test2",
+  }
+
   worker_config {
     count                      = 3
     availability_zone          = var.availability_zone
@@ -108,6 +116,7 @@ The following arguments are supported:
 * `cluster_id` - (Required, ForceNew) ID of the cluster.
 * `worker_config` - (Required, ForceNew) Deploy the machine configuration information of the 'WORK' service, and create <=20 units for common users.
 * `extra_args` - (Optional, ForceNew) Custom parameter information related to the node.
+* `labels` - (Optional, ForceNew) Labels of kubernetes scale worker created nodes.
 
 The `data_disk` object supports the following: