Merge remote-tracking branch 'upstream/master'

Author: gailwang

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.