Merge pull request #639 from rostachen/master

fix:TkeCvmCreateInfo.data_disk.disk_type support CLOUD_HSSD

Author: ivandksun

CHANGELOG.md

@@ -1,4 +1,10 @@
-## 1.56.12 (Unreleased)
+## 1.56.13 (Unreleased)
+
+## 1.56.12 (July 02, 2021)
+
+BUG FIXES
+ 
+* Resource `TkeCvmCreateInfo.data_disk.disk_type` support CLOUD_HSSD
 
 ## 1.56.11 
 

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -444,8 +444,8 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
 						ForceNew:     true,
 						Optional:     true,
 						Default:      SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
-						ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
-						Description:  "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.",
+						//ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
+						Description:  "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD`.",
 					},
 					"disk_size": {
 						Type:        schema.TypeInt,

website/docs/r/kubernetes_cluster.html.markdown

@@ -299,7 +299,7 @@ The following arguments are supported:
 * `container_runtime` - (Optional, ForceNew) Runtime type of the cluster, the available values include: 'docker' and 'containerd'. Default is 'docker'.
 * `deletion_protection` - (Optional) Indicates whether cluster deletion protection is enabled. Default is false.
 * `docker_graph_path` - (Optional, ForceNew) Docker graph path. Default is `/var/lib/docker`.
-* `enable_customized_pod_cidr` - (Optional, ForceNew) Whether to enable the custom mode of node podCIDR size. Default is false.
+* `enable_customized_pod_cidr` - (Optional) Whether to enable the custom mode of node podCIDR size. Default is false.
 * `eni_subnet_ids` - (Optional) Subnet Ids for cluster with VPC-CNI network mode. This field can only set when field `network_type` is 'VPC-CNI'. `eni_subnet_ids` can not empty once be set.
 * `exist_instance` - (Optional, ForceNew) create tke cluster by existed instances.
 * `extra_args` - (Optional, ForceNew) Custom parameter information related to the node.
@@ -330,7 +330,7 @@ The `cluster_extra_args` object supports the following:
 The `data_disk` object supports the following:
 
 * `disk_size` - (Optional, ForceNew) Volume of disk in GB. Default is `0`.
-* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.
+* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD`.
 * `snapshot_id` - (Optional, ForceNew) Data disk snapshot ID.
 
 The `exist_instance` object supports the following:

website/docs/r/kubernetes_scale_worker.html.markdown

@@ -135,7 +135,7 @@ The `data_disk` object supports the following:
 The `data_disk` object supports the following:
 
 * `disk_size` - (Optional, ForceNew) Volume of disk in GB. Default is `0`.
-* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.
+* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD`.
 * `snapshot_id` - (Optional, ForceNew) Data disk snapshot ID.
 
 The `worker_config` object supports the following:

website/docs/r/vpn_connection.html.markdown

@@ -59,15 +59,15 @@ The following arguments are supported:
 * `ike_local_address` - (Optional) Local address of IKE operation specification, valid when ike_local_identity is `ADDRESS`, generally the value is `public_ip_address` of the related VPN gateway.
 * `ike_local_fqdn_name` - (Optional) Local FQDN name of the IKE operation specification.
 * `ike_local_identity` - (Optional) Local identity way of IKE operation specification. Valid values: `ADDRESS`, `FQDN`. Default value is `ADDRESS`.
-* `ike_proto_authen_algorithm` - (Optional) Proto authenticate algorithm of the IKE operation specification. Valid values: `MD5`, `SHA`. Default Value is `MD5`.
+* `ike_proto_authen_algorithm` - (Optional) Proto authenticate algorithm of the IKE operation specification. Valid values: `MD5`, `SHA`, `SHA-256`. Default Value is `MD5`.
 * `ike_proto_encry_algorithm` - (Optional) Proto encrypt algorithm of the IKE operation specification. Valid values: `3DES-CBC`, `AES-CBC-128`, `AES-CBC-128`, `AES-CBC-256`, `DES-CBC`. Default value is `3DES-CBC`.
 * `ike_remote_address` - (Optional) Remote address of IKE operation specification, valid when ike_remote_identity is `ADDRESS`, generally the value is `public_ip_address` of the related customer gateway.
 * `ike_remote_fqdn_name` - (Optional) Remote FQDN name of the IKE operation specification.
 * `ike_remote_identity` - (Optional) Remote identity way of IKE operation specification. Valid values: `ADDRESS`, `FQDN`. Default value is `ADDRESS`.
 * `ike_sa_lifetime_seconds` - (Optional) SA lifetime of the IKE operation specification, unit is `second`. The value ranges from 60 to 604800. Default value is 86400 seconds.
 * `ike_version` - (Optional) Version of the IKE operation specification. Default value is `IKEV1`.
 * `ipsec_encrypt_algorithm` - (Optional) Encrypt algorithm of the IPSEC operation specification. Valid values: `3DES-CBC`, `AES-CBC-128`, `AES-CBC-128`, `AES-CBC-256`, `DES-CBC`. Default value is `3DES-CBC`.
-* `ipsec_integrity_algorithm` - (Optional) Integrity algorithm of the IPSEC operation specification. Valid values: `SHA1`, `MD5`. Default value is `MD5`.
+* `ipsec_integrity_algorithm` - (Optional) Integrity algorithm of the IPSEC operation specification. Valid values: `SHA1`, `MD5`, `SHA-256`. Default value is `MD5`.
 * `ipsec_pfs_dh_group` - (Optional) PFS DH group. Valid value: `GROUP1`, `GROUP2`, `GROUP5`, `GROUP14`, `GROUP24`, `NULL`. Default value is `NULL`.
 * `ipsec_sa_lifetime_seconds` - (Optional) SA lifetime of the IPSEC operation specification, unit is second. Valid value ranges: [180~604800]. Default value is 3600 seconds.
 * `ipsec_sa_lifetime_traffic` - (Optional) SA lifetime of the IPSEC operation specification, unit is KB. The value should not be less then 2560. Default value is 1843200.