Add hostname for k8s cluster attachment (#585)

Author: gailwang

CHANGELOG.md

@@ -1,4 +1,10 @@
 ## 1.53.3 (Unreleased)
+
+ENHANCEMENTS:
+
+* Data Source `tencentcloud_cbs_storages` add `throughput_performance` to support adding extra performance to the cbs resources.
+* Resource `tencentcloud_kubernetes_cluster_attachment` add `hostname` to support setting hostname with the attached instance.
+
 ## 1.53.2 (February 01, 2021)
 
 ENHANCEMENTS:

tencentcloud/data_source_tc_cbs_storages.go

@@ -144,6 +144,11 @@ func dataSourceTencentCloudCbsStorages() *schema.Resource {
 							Computed:    true,
 							Description: "Pay type of the CBS instance.",
 						},
+						"throughput_performance": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Add extra performance to the data disk. Only works when disk type is `CLOUD_TSSD` or `CLOUD_HSSD`.",
+						},
 					},
 				},
 			},
@@ -190,20 +195,21 @@ func dataSourceTencentCloudCbsStoragesRead(d *schema.ResourceData, meta interfac
 		storageList := make([]map[string]interface{}, 0, len(storages))
 		for _, storage := range storages {
 			mapping := map[string]interface{}{
-				"storage_id":         storage.DiskId,
-				"storage_name":       storage.DiskName,
-				"storage_usage":      storage.DiskUsage,
-				"storage_type":       storage.DiskType,
-				"availability_zone":  storage.Placement.Zone,
-				"project_id":         storage.Placement.ProjectId,
-				"storage_size":       storage.DiskSize,
-				"attached":           storage.Attached,
-				"instance_id":        storage.InstanceId,
-				"encrypt":            storage.Encrypt,
-				"create_time":        storage.CreateTime,
-				"status":             storage.DiskState,
-				"prepaid_renew_flag": storage.RenewFlag,
-				"charge_type":        storage.DiskChargeType,
+				"storage_id":             storage.DiskId,
+				"storage_name":           storage.DiskName,
+				"storage_usage":          storage.DiskUsage,
+				"storage_type":           storage.DiskType,
+				"availability_zone":      storage.Placement.Zone,
+				"project_id":             storage.Placement.ProjectId,
+				"storage_size":           storage.DiskSize,
+				"attached":               storage.Attached,
+				"instance_id":            storage.InstanceId,
+				"encrypt":                storage.Encrypt,
+				"create_time":            storage.CreateTime,
+				"status":                 storage.DiskState,
+				"prepaid_renew_flag":     storage.RenewFlag,
+				"charge_type":            storage.DiskChargeType,
+				"throughput_performance": storage.ThroughputPerformance,
 			}
 			if storage.Tags != nil {
 				tags := make(map[string]interface{}, len(storage.Tags))

tencentcloud/resource_tc_kubernetes_cluster_attachment.go

@@ -223,6 +223,15 @@ func resourceTencentCloudTkeClusterAttachment() *schema.Resource {
 			Elem:        &schema.Schema{Type: schema.TypeString},
 			Description: "The key pair to use for the instance, it looks like skey-16jig7tx, it should be set if `password` not set.",
 		},
+		"hostname": {
+			Type:     schema.TypeString,
+			ForceNew: true,
+			Optional: true,
+			Description: "The host name of the attached instance. " +
+				"Dot (.) and dash (-) cannot be used as the first and last characters of HostName and cannot be used consecutively. " +
+				"Windows example: The length of the name character is [2, 15], letters (capitalization is not restricted), numbers and dashes (-) are allowed, dots (.) are not supported, and not all numbers are allowed. " +
+				"Examples of other types (Linux, etc.): The character length is [2, 60], and multiple dots are allowed. There is a segment between the dots. Each segment allows letters (with no limitation on capitalization), numbers and dashes (-).",
+		},
 		"worker_config": {
 			Type:     schema.TypeList,
 			ForceNew: true,
@@ -392,6 +401,7 @@ func resourceTencentCloudTkeClusterAttachmentRead(d *schema.ResourceData, meta i
 	if len(instance.LoginSettings.KeyIds) > 0 {
 		_ = d.Set("key_ids", instance.LoginSettings.KeyIds)
 	}
+
 	_ = d.Set("security_groups", helper.StringsInterfaces(instance.SecurityGroupIds))
 	return nil
 }
@@ -439,6 +449,10 @@ func resourceTencentCloudTkeClusterAttachmentCreate(d *schema.ResourceData, meta
 	}
 
 	request.InstanceAdvancedSettings.Labels = GetTkeLabels(d, "labels")
+	if hostName, ok := d.GetOk("hostname"); ok {
+		hostNameStr := hostName.(string)
+		request.HostName = &hostNameStr
+	}
 
 	/*cvm has been  attached*/
 	var err error

website/docs/d/cbs_storages.html.markdown

@@ -52,5 +52,6 @@ In addition to all arguments above, the following attributes are exported:
   * `storage_type` - Types of storage medium.
   * `storage_usage` - Types of CBS.
   * `tags` - The available tags within this CBS.
+  * `throughput_performance` - Add extra performance to the data disk. Only works when disk type is `CLOUD_TSSD` or `CLOUD_HSSD`.
 
 

website/docs/r/kubernetes_cluster_attachment.html.markdown

@@ -106,6 +106,7 @@ The following arguments are supported:
 
 * `cluster_id` - (Required, ForceNew) ID of the cluster.
 * `instance_id` - (Required, ForceNew) ID of the CVM instance, this cvm will reinstall the system.
+* `hostname` - (Optional, ForceNew) The host name of the attached instance. Dot (.) and dash (-) cannot be used as the first and last characters of HostName and cannot be used consecutively. Windows example: The length of the name character is [2, 15], letters (capitalization is not restricted), numbers and dashes (-) are allowed, dots (.) are not supported, and not all numbers are allowed. Examples of other types (Linux, etc.): The character length is [2, 60], and multiple dots are allowed. There is a segment between the dots. Each segment allows letters (with no limitation on capitalization), numbers and dashes (-).
 * `key_ids` - (Optional, ForceNew) The key pair to use for the instance, it looks like skey-16jig7tx, it should be set if `password` not set.
 * `labels` - (Optional, ForceNew) Labels of tke attachment exits CVM.
 * `password` - (Optional, ForceNew) Password to access, should be set if `key_ids` not set.