Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CHANGELOG.md

Author: gailwang

CHANGELOG.md

@@ -1,4 +1,17 @@
-## 1.53.6 (Unreleased)
+## 1.53.8 (Unreleased)
+
+ENHANCEMENTS:
+
+* Resource `tencentcloud_instance` remove limit of `data_disk_size`.
+
+
+## 1.53.7 (March 09, 2021)
+
+ENHANCEMENTS:
+
+* Resource `tencentcloud_kubernetes_node_pool` add `internet_max_bandwidth_out`, `public_ip_assigned` to support internet traffic setting.
+
+## 1.53.6 (March 09, 2021)
 
 ENHANCEMENTS:
 * Resource `tencentcloud_eip` support `internet_max_bandwidth_out` modification.

tencentcloud/connectivity/transport.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-const ReqClient = "Terraform-v1.53.5"
+const ReqClient = "Terraform-v1.53.6"
 
 type LogRoundTripper struct {
 }

tencentcloud/extension_tke.go

@@ -56,7 +56,7 @@ const (
 	TKE_CLUSTER_OS_TYPE_GENERAL          = "GENERAL"
 )
 
-var TKE_CLUSTER_OS_TYPES = []string{TKE_CLUSTER_OS_TYPE_DOCKER_CUSTOMIZE, TKE_CLUSTER_OS_TYPE_GENERAL}
+var TKE_CLUSTER_OS_TYPES = []string{TKE_CLUSTER_OS_TYPE_GENERAL}
 
 const (
 	TkeInternetStatusCreating      = "Creating"

tencentcloud/resource_tc_instance.go

@@ -276,11 +276,10 @@ func resourceTencentCloudInstance() *schema.Resource {
 							Description: "Data disk type. For more information about limits on different data disk types, see [Storage Overview](https://intl.cloud.tencent.com/document/product/213/4952). Valid values: `LOCAL_BASIC`: local disk, `LOCAL_SSD`: local SSD disk, `CLOUD_BASIC`: HDD cloud disk, `CLOUD_PREMIUM`: Premium Cloud Storage, `CLOUD_SSD`: SSD, `CLOUD_HSSD`: Enhanced SSD. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated.",
 						},
 						"data_disk_size": {
-							Type:         schema.TypeInt,
-							Required:     true,
-							ForceNew:     true,
-							ValidateFunc: validateIntegerInRange(10, 16000),
-							Description:  "Size of the data disk, and unit is GB. If disk type is `CLOUD_SSD`, the size range is [100, 16000], and the others are [10-16000].",
+							Type:        schema.TypeInt,
+							Required:    true,
+							ForceNew:    true,
+							Description: "Size of the data disk, and unit is GB. If disk type is `CLOUD_SSD`, the size range is [100, 16000], and the others are [10-16000].",
 						},
 						"data_disk_snapshot_id": {
 							Type:        schema.TypeString,

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -498,8 +498,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			Default:      TKE_CLUSTER_OS_TYPE_GENERAL,
 			ValidateFunc: validateAllowedStringValue(TKE_CLUSTER_OS_TYPES),
 			Description: "Image type of the cluster os, the available values include: '" + strings.Join(TKE_CLUSTER_OS_TYPES, "','") +
-				"'. Default is '" + TKE_CLUSTER_OS_TYPE_GENERAL + "'. 'DOCKER_CUSTOMIZE' means 'TKE-Optimized'. " +
-				"Only 'centos7.6x86_64' or 'ubuntu18.04.1 LTSx86_64' support 'DOCKER_CUSTOMIZE' now.",
+				"'. Default is '" + TKE_CLUSTER_OS_TYPE_GENERAL + ".",
 		},
 		"container_runtime": {
 			Type:         schema.TypeString,
@@ -603,7 +602,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			Optional: true,
 			Default:  "",
 			Description: "Cluster kube-proxy mode, the available values include: 'kube-proxy-bpf'. Default is not set." +
-				"When set to kube-proxy-bpf, cluster version greater than 1.14 and with TKE-optimized kernel is required.",
+				"When set to kube-proxy-bpf, cluster version greater than 1.14 and with Tencent Linux 2.4 is required.",
 		},
 		"vpc_id": {
 			Type:         schema.TypeString,

tencentcloud/resource_tc_kubernetes_node_pool.go

@@ -60,6 +60,8 @@ resource "tencentcloud_kubernetes_node_pool" "mynodepool" {
     }
 
     internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
+    internet_max_bandwidth_out = 10
+    public_ip_assigned         = true
     password                   = "test123#"
     enhanced_security_service  = false
     enhanced_monitor_service   = false
@@ -170,6 +172,19 @@ func composedKubernetesAsScalingConfigPara() map[string]*schema.Schema {
 			ValidateFunc: validateAllowedStringValue(INTERNET_CHARGE_ALLOW_TYPE),
 			Description:  "Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
 		},
+		"internet_max_bandwidth_out": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			ForceNew:    true,
+			Default:     0,
+			Description: "Max bandwidth of Internet access in Mbps. Default is `0`.",
+		},
+		"public_ip_assigned": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			ForceNew:    true,
+			Description: "Specify whether to assign an Internet IP address.",
+		},
 		"password": {
 			Type:          schema.TypeString,
 			Optional:      true,
@@ -474,6 +489,13 @@ func comosedKubernetesAsScalingConfigParaSerial(dMap map[string]interface{}, met
 	if v, ok := dMap["internet_charge_type"]; ok {
 		request.InternetAccessible.InternetChargeType = helper.String(v.(string))
 	}
+	if v, ok := dMap["internet_max_bandwidth_out"]; ok {
+		request.InternetAccessible.InternetMaxBandwidthOut = helper.IntUint64(v.(int))
+	}
+	if v, ok := dMap["public_ip_assigned"]; ok {
+		publicIpAssigned := v.(bool)
+		request.InternetAccessible.PublicIpAssigned = &publicIpAssigned
+	}
 
 	request.LoginSettings = &as.LoginSettings{}
 

tencentcloud/resource_tc_kubernetes_node_pool_test.go

@@ -200,6 +200,8 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
     }
 
     internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
+    internet_max_bandwidth_out = 10
+    public_ip_assigned         = true
     password                   = "test123#"
     enhanced_security_service  = false
     enhanced_monitor_service   = false
@@ -252,6 +254,8 @@ resource "tencentcloud_kubernetes_node_pool" "np_test" {
     }
 
     internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
+    internet_max_bandwidth_out = 10
+    public_ip_assigned         = true
     password                   = "test123#"
     enhanced_security_service  = false
     enhanced_monitor_service   = false

website/docs/r/kubernetes_cluster.html.markdown

@@ -220,7 +220,7 @@ The following arguments are supported:
 * `cluster_max_pod_num` - (Optional, ForceNew) The maximum number of Pods per node in the cluster. Default is 256. Must be a multiple of 16 and large than 32.
 * `cluster_max_service_num` - (Optional, ForceNew) The maximum number of services in the cluster. Default is 256. Must be a multiple of 16.
 * `cluster_name` - (Optional) Name of the cluster.
-* `cluster_os_type` - (Optional, ForceNew) Image type of the cluster os, the available values include: 'DOCKER_CUSTOMIZE','GENERAL'. Default is 'GENERAL'. 'DOCKER_CUSTOMIZE' means 'TKE-Optimized'. Only 'centos7.6x86_64' or 'ubuntu18.04.1 LTSx86_64' support 'DOCKER_CUSTOMIZE' now.
+* `cluster_os_type` - (Optional, ForceNew) Image type of the cluster os, the available values include: 'GENERAL'. Default is 'GENERAL.
 * `cluster_os` - (Optional, ForceNew) Operating system of the cluster, the available values include: 'centos7.2x86_64','centos7.6x86_64','ubuntu16.04.1 LTSx86_64','ubuntu18.04.1 LTSx86_64','tlinux2.4x86_64'. Default is 'ubuntu16.04.1 LTSx86_64'.
 * `cluster_version` - (Optional) Version of the cluster, Default is '1.10.5'.
 * `container_runtime` - (Optional, ForceNew) Runtime type of the cluster, the available values include: 'docker' and 'containerd'. Default is 'docker'.
@@ -230,7 +230,7 @@ The following arguments are supported:
 * `extra_args` - (Optional, ForceNew) Custom parameter information related to the node.
 * `ignore_cluster_cidr_conflict` - (Optional, ForceNew) Indicates whether to ignore the cluster cidr conflict error. Default is false.
 * `is_non_static_ip_mode` - (Optional, ForceNew) Indicates whether static ip mode is enabled. Default is false.
-* `kube_proxy_mode` - (Optional) Cluster kube-proxy mode, the available values include: 'kube-proxy-bpf'. Default is not set.When set to kube-proxy-bpf, cluster version greater than 1.14 and with TKE-optimized kernel is required.
+* `kube_proxy_mode` - (Optional) Cluster kube-proxy mode, the available values include: 'kube-proxy-bpf'. Default is not set.When set to kube-proxy-bpf, cluster version greater than 1.14 and with Tencent Linux 2.4 is required.
 * `labels` - (Optional, ForceNew) Labels of tke cluster nodes.
 * `managed_cluster_internet_security_policies` - (Optional) Security policies for managed cluster internet, like:'192.168.1.0/24' or '113.116.51.27', '0.0.0.0/0' means all. This field can only set when field `cluster_deploy_type` is 'MANAGED_CLUSTER' and `cluster_internet` is true. `managed_cluster_internet_security_policies` can not delete or empty once be set.
 * `master_config` - (Optional, ForceNew) Deploy the machine configuration information of the 'MASTER_ETCD' service, and create <=7 units for common users.

website/docs/r/kubernetes_node_pool.html.markdown

@@ -68,10 +68,12 @@ resource "tencentcloud_kubernetes_node_pool" "mynodepool" {
       disk_size = 50
     }
 
-    internet_charge_type      = "TRAFFIC_POSTPAID_BY_HOUR"
-    password                  = "test123#"
-    enhanced_security_service = false
-    enhanced_monitor_service  = false
+    internet_charge_type       = "TRAFFIC_POSTPAID_BY_HOUR"
+    internet_max_bandwidth_out = 10
+    public_ip_assigned         = true
+    password                   = "test123#"
+    enhanced_security_service  = false
+    enhanced_monitor_service   = false
 
   }
 
@@ -129,8 +131,10 @@ The `auto_scaling_config` object supports the following:
 * `enhanced_monitor_service` - (Optional, ForceNew) To specify whether to enable cloud monitor service. Default is TRUE.
 * `enhanced_security_service` - (Optional, ForceNew) To specify whether to enable cloud security service. Default is TRUE.
 * `internet_charge_type` - (Optional, ForceNew) Charge types for network traffic. Valid value: `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.
+* `internet_max_bandwidth_out` - (Optional, ForceNew) Max bandwidth of Internet access in Mbps. Default is `0`.
 * `key_ids` - (Optional, ForceNew) ID list of keys.
 * `password` - (Optional, ForceNew) Password to access.
+* `public_ip_assigned` - (Optional, ForceNew) Specify whether to assign an Internet IP address.
 * `security_group_ids` - (Optional, ForceNew) Security groups to which a CVM instance belongs.
 * `system_disk_size` - (Optional, ForceNew) Volume of system disk in GB. Default is `50`.
 * `system_disk_type` - (Optional, ForceNew) Type of a CVM disk. Valid value: `CLOUD_PREMIUM` and `CLOUD_SSD`. Default is `CLOUD_PREMIUM`.