Skip to content

Commit c181056

Browse files
ivandksunivandksun
authored
Merge pull request #2 from tencentcloudstack/master
fetch upstream
2 parents a921cd8 + 1fd905c commit c181056

9 files changed

+28
-14
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
## 1.56.13 (Unreleased)
1+
## 1.56.14 (Unreleased)
22

3-
## 1.56.12
3+
## 1.56.13 (July 02, 2021)
44

55
BUG FIXES
6+
7+
* Resource `TkeCvmCreateInfo.data_disk.disk_type` support CLOUD_HSSD and CLOUD_TSSD
8+
9+
## 1.56.12 (July 02, 2021)
610

7-
* Resource `tencentcloud_kubenetes_cluster` comment out the validate data_disk to supports hssd
11+
BUG FIXES
12+
13+
* Resource `TkeCvmCreateInfo.data_disk.disk_type` support CLOUD_HSSD
814

915
## 1.56.11
1016

‎tencentcloud/extension_as.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@ const (
66
SYSTEM_DISK_TYPE_CLOUD_BASIC = "CLOUD_BASIC"
77
SYSTEM_DISK_TYPE_CLOUD_PREMIUM = "CLOUD_PREMIUM"
88
SYSTEM_DISK_TYPE_CLOUD_SSD = "CLOUD_SSD"
9+
SYSTEM_DISK_TYPE_CLOUD_HSSD = "CLOUD_HSSD"
10+
SYSTEM_DISK_TYPE_CLOUD_TSSD = "CLOUD_TSSD"
911
)
1012

1113
var SYSTEM_DISK_ALLOW_TYPE = []string{
1214
SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
1315
SYSTEM_DISK_TYPE_CLOUD_SSD,
16+
SYSTEM_DISK_TYPE_CLOUD_HSSD,
17+
SYSTEM_DISK_TYPE_CLOUD_TSSD,
1418
}
1519

1620
const (

‎tencentcloud/extension_vpc.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,21 +186,25 @@ var VPN_IKE_PROPO_ENCRY_ALGORITHM = []string{
186186
const (
187187
VPN_IKE_PROPO_AUTHEN_ALGORITHM_SHA = "SHA"
188188
VPN_IKE_PROPO_AUTHEN_ALGORITHM_MD5 = "MD5"
189+
VPN_IKE_PROPO_AUTHEN_ALGORITHM_SHA256 = "SHA-256"
189190
)
190191

191192
var VPN_IKE_PROPO_AUTHEN_ALGORITHM = []string{
192193
VPN_IKE_PROPO_AUTHEN_ALGORITHM_SHA,
193194
VPN_IKE_PROPO_AUTHEN_ALGORITHM_MD5,
195+
VPN_IKE_PROPO_AUTHEN_ALGORITHM_SHA256,
194196
}
195197

196198
const (
197199
VPN_IPSEC_INTEGRITY_ALGORITHM_SHA1 = "SHA1"
198200
VPN_IPSEC_INTEGRITY_ALGORITHM_MD5 = "MD5"
201+
VPN_IPSEC_INTEGRITY_ALGORITHM_SHA256 = "SHA-256"
199202
)
200203

201204
var VPN_IPSEC_INTEGRITY_ALGORITHM = []string{
202205
VPN_IPSEC_INTEGRITY_ALGORITHM_SHA1,
203206
VPN_IPSEC_INTEGRITY_ALGORITHM_MD5,
207+
VPN_IPSEC_INTEGRITY_ALGORITHM_SHA256,
204208
}
205209

206210
const (

‎tencentcloud/resource_tc_kubernetes_cluster.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
444444
ForceNew: true,
445445
Optional: true,
446446
Default: SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
447-
//ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
448-
Description: "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.",
447+
ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
448+
Description: "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.",
449449
},
450450
"disk_size": {
451451
Type: schema.TypeInt,

‎tencentcloud/resource_tc_kubernetes_scale_worker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func resourceTencentCloudTkeScaleWorker() *schema.Resource {
194194
Optional: true,
195195
Default: SYSTEM_DISK_TYPE_CLOUD_PREMIUM,
196196
ValidateFunc: validateAllowedStringValue(SYSTEM_DISK_ALLOW_TYPE),
197-
Description: "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.",
197+
Description: "Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.",
198198
},
199199
"disk_size": {
200200
Type: schema.TypeInt,

‎tencentcloud/resource_tc_vpn_connection.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func resourceTencentCloudVpnConnection() *schema.Resource {
142142
Optional: true,
143143
Default: VPN_IKE_PROPO_AUTHEN_ALGORITHM_MD5,
144144
ValidateFunc: validateAllowedStringValue(VPN_IKE_PROPO_AUTHEN_ALGORITHM),
145-
Description: "Proto authenticate algorithm of the IKE operation specification. Valid values: `MD5`, `SHA`. Default Value is `MD5`.",
145+
Description: "Proto authenticate algorithm of the IKE operation specification. Valid values: `MD5`, `SHA`, `SHA-256`. Default Value is `MD5`.",
146146
},
147147
"ike_exchange_mode": {
148148
Type: schema.TypeString,
@@ -221,7 +221,7 @@ func resourceTencentCloudVpnConnection() *schema.Resource {
221221
Optional: true,
222222
Default: VPN_IPSEC_INTEGRITY_ALGORITHM_MD5,
223223
ValidateFunc: validateAllowedStringValue(VPN_IPSEC_INTEGRITY_ALGORITHM),
224-
Description: "Integrity algorithm of the IPSEC operation specification. Valid values: `SHA1`, `MD5`. Default value is `MD5`.",
224+
Description: "Integrity algorithm of the IPSEC operation specification. Valid values: `SHA1`, `MD5`, `SHA-256`. Default value is `MD5`.",
225225
},
226226
"ipsec_sa_lifetime_seconds": {
227227
Type: schema.TypeInt,

‎website/docs/r/kubernetes_cluster.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ The following arguments are supported:
299299
* `container_runtime` - (Optional, ForceNew) Runtime type of the cluster, the available values include: 'docker' and 'containerd'. Default is 'docker'.
300300
* `deletion_protection` - (Optional) Indicates whether cluster deletion protection is enabled. Default is false.
301301
* `docker_graph_path` - (Optional, ForceNew) Docker graph path. Default is `/var/lib/docker`.
302-
* `enable_customized_pod_cidr` - (Optional, ForceNew) Whether to enable the custom mode of node podCIDR size. Default is false.
302+
* `enable_customized_pod_cidr` - (Optional) Whether to enable the custom mode of node podCIDR size. Default is false.
303303
* `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.
304304
* `exist_instance` - (Optional, ForceNew) create tke cluster by existed instances.
305305
* `extra_args` - (Optional, ForceNew) Custom parameter information related to the node.
@@ -330,7 +330,7 @@ The `cluster_extra_args` object supports the following:
330330
The `data_disk` object supports the following:
331331

332332
* `disk_size` - (Optional, ForceNew) Volume of disk in GB. Default is `0`.
333-
* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.
333+
* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
334334
* `snapshot_id` - (Optional, ForceNew) Data disk snapshot ID.
335335

336336
The `exist_instance` object supports the following:

‎website/docs/r/kubernetes_scale_worker.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ The `data_disk` object supports the following:
128128

129129
* `auto_format_and_mount` - (Optional, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
130130
* `disk_size` - (Optional, ForceNew) Volume of disk in GB. Default is `0`.
131-
* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.
131+
* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
132132
* `file_system` - (Optional, ForceNew) File system, e.g. `ext3/ext4/xfs`.
133133
* `mount_target` - (Optional, ForceNew) Mount target.
134134

135135
The `data_disk` object supports the following:
136136

137137
* `disk_size` - (Optional, ForceNew) Volume of disk in GB. Default is `0`.
138-
* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.
138+
* `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
139139
* `snapshot_id` - (Optional, ForceNew) Data disk snapshot ID.
140140

141141
The `worker_config` object supports the following:

‎website/docs/r/vpn_connection.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ The following arguments are supported:
5959
* `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.
6060
* `ike_local_fqdn_name` - (Optional) Local FQDN name of the IKE operation specification.
6161
* `ike_local_identity` - (Optional) Local identity way of IKE operation specification. Valid values: `ADDRESS`, `FQDN`. Default value is `ADDRESS`.
62-
* `ike_proto_authen_algorithm` - (Optional) Proto authenticate algorithm of the IKE operation specification. Valid values: `MD5`, `SHA`. Default Value is `MD5`.
62+
* `ike_proto_authen_algorithm` - (Optional) Proto authenticate algorithm of the IKE operation specification. Valid values: `MD5`, `SHA`, `SHA-256`. Default Value is `MD5`.
6363
* `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`.
6464
* `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.
6565
* `ike_remote_fqdn_name` - (Optional) Remote FQDN name of the IKE operation specification.
6666
* `ike_remote_identity` - (Optional) Remote identity way of IKE operation specification. Valid values: `ADDRESS`, `FQDN`. Default value is `ADDRESS`.
6767
* `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.
6868
* `ike_version` - (Optional) Version of the IKE operation specification. Default value is `IKEV1`.
6969
* `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`.
70-
* `ipsec_integrity_algorithm` - (Optional) Integrity algorithm of the IPSEC operation specification. Valid values: `SHA1`, `MD5`. Default value is `MD5`.
70+
* `ipsec_integrity_algorithm` - (Optional) Integrity algorithm of the IPSEC operation specification. Valid values: `SHA1`, `MD5`, `SHA-256`. Default value is `MD5`.
7171
* `ipsec_pfs_dh_group` - (Optional) PFS DH group. Valid value: `GROUP1`, `GROUP2`, `GROUP5`, `GROUP14`, `GROUP24`, `NULL`. Default value is `NULL`.
7272
* `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.
7373
* `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.

0 commit comments

Comments
 (0)