Merge pull request #591 from ChrisdeR/master

Add internet_max_bandwidth_out and public_ip_assigned for resource tke node pool

Author: gailwang

CHANGELOG.md

@@ -1,4 +1,10 @@
-## 1.53.7 (Unreleased)
+## 1.53.8 (Unreleased)
+## 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:

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_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`.