Skip to content

Commit c384a7f

Browse files
gailwanggailwang
authored
Merge branch 'master' into master
2 parents 3ab4d52 + b38d778 commit c384a7f

16 files changed

+529
-50
lines changed

‎CHANGELOG.md‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 1.40.1 (Unreleased)
1+
## 1.41.0 (Unreleased)
22

33
FEATURES:
44

@@ -11,6 +11,29 @@ FEATURES:
1111
* **New Data Source**: `tencentcloud_sqlserver_readonly_groups`
1212
* **New Data Source**: `tencentcloud_sqlserver_zone_configs`
1313

14+
## 1.40.3 (August 11, 2020)
15+
16+
ENHANCEMENTS:
17+
18+
* Data Source: `tencentcloud_kubernetes_clusters`add new attributes `cluster_as_enabled`,`node_name_type`,`cluster_extra_args`,`network_type`,`is_non_static_ip_mode`,`kube_proxy_mode`,`service_cidr`,`eni_subnet_ids`,`claim_expired_seconds` and `deletion_protection`.
19+
20+
BUG FIXES:
21+
22+
* Resource: `tencentcloud_vpn_gateway` fix creation of instance when `vpc_id` is specified.
23+
* Resource: `tencentcloud_vpn_connection` fix creation of instance when `vpc_id` is specified.
24+
* Resource: `tencentcloud_instance` fix `internet_charge_type` inconsistency when public ip is not allocated.
25+
26+
## 1.40.2 (August 08, 2020)
27+
28+
BUG FIXES:
29+
30+
* Resource: `tencentcloud_instance` fix accidentally fail to delete prepaid instance ([#485](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/issues/485)).
31+
32+
## 1.40.1 (August 05, 2020)
33+
34+
BUG FIXES:
35+
36+
* Resource: `tencentcloud_vpn_connection` fix mulit `security_group_policy` is not supported ([#487](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/issues/487)).
1437

1538
## 1.40.0 (July 31, 2020)
1639

‎examples/tencentcloud-tke/main.tf‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,59 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
4141
}
4242
}
4343

44+
#examples for MANAGED_CLUSTER VPC-CNI network type cluster with customized master params
45+
resource "tencentcloud_kubernetes_cluster" "managed_vpc_cni_cluster" {
46+
cluster_version = "1.14.3"
47+
vpc_id = var.vpc
48+
cluster_max_pod_num = 32
49+
cluster_name = "testvpccni"
50+
cluster_desc = "test vpc-cni cluster desc"
51+
cluster_max_service_num = 32
52+
service_cidr = "192.168.128.0/24"
53+
eni_subnet_ids = ["subnet-hmmlszs7", "subnet-4o0v4e7j"]
54+
claim_expired_seconds = 300
55+
network_type = "VPC-CNI"
56+
is_non_static_ip_mode = true
57+
cluster_extra_args {
58+
kube_apiserver = ["max-requests-inflight=450"]
59+
kube_controller_manager = ["kube-api-burst=500", "kube-api-qps=200"]
60+
kube_scheduler = ["kube-api-burst=500", "kube-api-qps=200"]
61+
}
62+
63+
worker_config {
64+
count = 2
65+
availability_zone = var.availability_zone
66+
instance_type = var.default_instance_type
67+
system_disk_type = "CLOUD_SSD"
68+
system_disk_size = 60
69+
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
70+
internet_max_bandwidth_out = 100
71+
public_ip_assigned = true
72+
subnet_id = var.subnet
73+
74+
data_disk {
75+
disk_type = "CLOUD_PREMIUM"
76+
disk_size = 50
77+
}
78+
79+
enhanced_security_service = false
80+
enhanced_monitor_service = false
81+
user_data = "dGVzdA=="
82+
password = "ZZXXccvv1212"
83+
}
84+
85+
cluster_deploy_type = "MANAGED_CLUSTER"
86+
87+
tags = {
88+
"test" = "test"
89+
}
90+
91+
labels = {
92+
"test1" = "test1",
93+
"test2" = "test2",
94+
}
95+
}
96+
4497
#examples for INDEPENDENT_CLUSTER cluster
4598
resource "tencentcloud_kubernetes_cluster" "independing_cluster" {
4699
vpc_id = var.vpc

‎examples/tencentcloud-vpn/main.tf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ data "tencentcloud_vpn_connections" "example" {
6868
# vpn tunnel in the usual way.
6969
resource tencentcloud_vpn_gateway ccn_vpngw_example {
7070
name = "ccn-vpngw-example"
71-
vpc_id = ""
7271
bandwidth = 5
7372
zone = var.availability_zone
7473
type = "CCN"

‎tencentcloud/data_source_tc_kubernetes_clusters.go‎

Lines changed: 89 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,79 @@ func tkeClusterInfo() map[string]*schema.Schema {
9292
Computed: true,
9393
Description: "The maximum number of services in the cluster.",
9494
},
95+
"cluster_as_enabled": {
96+
Type: schema.TypeBool,
97+
Computed: true,
98+
Description: "Indicates whether to enable cluster node auto scaler.",
99+
},
100+
"node_name_type": {
101+
Type: schema.TypeString,
102+
Computed: true,
103+
Description: "Node name type of Cluster.",
104+
},
105+
"cluster_extra_args": {
106+
Type: schema.TypeList,
107+
Computed: true,
108+
Elem: &schema.Resource{
109+
Schema: map[string]*schema.Schema{
110+
"kube_apiserver": {
111+
Type: schema.TypeList,
112+
Computed: true,
113+
Elem: &schema.Schema{Type: schema.TypeString},
114+
Description: "The customized parameters for kube-apiserver.",
115+
},
116+
"kube_controller_manager": {
117+
Type: schema.TypeList,
118+
Computed: true,
119+
Elem: &schema.Schema{Type: schema.TypeString},
120+
Description: "The customized parameters for kube-controller-manager.",
121+
},
122+
"kube_scheduler": {
123+
Type: schema.TypeList,
124+
Computed: true,
125+
Elem: &schema.Schema{Type: schema.TypeString},
126+
Description: "The customized parameters for kube-scheduler.",
127+
},
128+
},
129+
},
130+
Description: "Customized parameters for master component.",
131+
},
132+
"network_type": {
133+
Type: schema.TypeString,
134+
Computed: true,
135+
Description: "Cluster network type.",
136+
},
137+
"is_non_static_ip_mode": {
138+
Type: schema.TypeBool,
139+
Computed: true,
140+
Description: "Indicates whether static ip mode is enabled.",
141+
},
142+
"kube_proxy_mode": {
143+
Type: schema.TypeString,
144+
Computed: true,
145+
Description: "Cluster kube-proxy mode.",
146+
},
147+
"service_cidr": {
148+
Type: schema.TypeString,
149+
Computed: true,
150+
Description: "The network address block of the cluster.",
151+
},
152+
"eni_subnet_ids": {
153+
Type: schema.TypeList,
154+
Computed: true,
155+
Elem: &schema.Schema{Type: schema.TypeString},
156+
Description: "Subnet Ids for cluster with VPC-CNI network mode.",
157+
},
158+
"claim_expired_seconds": {
159+
Type: schema.TypeInt,
160+
Computed: true,
161+
Description: "The expired seconds to recycle ENI.",
162+
},
163+
"deletion_protection": {
164+
Type: schema.TypeBool,
165+
Computed: true,
166+
Description: "Indicates whether cluster deletion protection is enabled.",
167+
},
95168
"cluster_node_num": {
96169
Type: schema.TypeInt,
97170
Computed: true,
@@ -225,12 +298,27 @@ LOOP:
225298
infoMap["cluster_deploy_type"] = info.DeployType
226299
infoMap["cluster_version"] = info.ClusterVersion
227300
infoMap["cluster_ipvs"] = info.Ipvs
301+
infoMap["cluster_as_enabled"] = info.AsEnabled
302+
infoMap["node_name_type"] = info.NodeNameType
303+
304+
infoMap["cluster_extra_args"] = []map[string]interface{}{{
305+
"kube_apiserver": info.ExtraArgs.KubeAPIServer,
306+
"kube_controller_manager": info.ExtraArgs.KubeControllerManager,
307+
"kube_scheduler": info.ExtraArgs.KubeScheduler,
308+
}}
309+
infoMap["network_type"] = info.NetworkType
310+
infoMap["is_non_static_ip_mode"] = info.IsNonStaticIpMode
311+
infoMap["deletion_protection"] = info.DeletionProtection
312+
infoMap["kube_proxy_mode"] = info.KubeProxyMode
228313
infoMap["vpc_id"] = info.VpcId
229314
infoMap["project_id"] = info.ProjectId
230315
infoMap["cluster_cidr"] = info.ClusterCidr
231316
infoMap["ignore_cluster_cidr_conflict"] = info.IgnoreClusterCidrConflict
232-
infoMap["cluster_max_pod_num"] = info.MaxClusterServiceNum
317+
infoMap["cluster_max_pod_num"] = info.MaxNodePodNum
233318
infoMap["cluster_max_service_num"] = info.MaxClusterServiceNum
319+
infoMap["service_cidr"] = info.ServiceCIDR
320+
infoMap["eni_subnet_ids"] = info.EniSubnetIds
321+
infoMap["claim_expired_seconds"] = info.ClaimExpiredSeconds
234322
infoMap["cluster_node_num"] = info.ClusterNodeNum
235323
infoMap["tags"] = info.Tags
236324

‎tencentcloud/extension_tke.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,23 @@ const (
6161
TkeInternetStatusDeletedFailed = "DeletedFailed"
6262
TkeInternetStatusNotfound = "NotFound"
6363
)
64+
65+
const (
66+
TKE_CLUSTER_NETWORK_TYPE_GR = "GR"
67+
TKE_CLUSTER_NETWORK_TYPE_VPC_CNI = "VPC-CNI"
68+
)
69+
70+
var TKE_CLUSTER_NETWORK_TYPE = []string{TKE_CLUSTER_NETWORK_TYPE_GR, TKE_CLUSTER_NETWORK_TYPE_VPC_CNI}
71+
72+
const (
73+
TKE_CLUSTER_NODE_NAME_TYPE_LAN_IP = "lan-ip"
74+
TKE_CLUSTER_NODE_NAME_TYPE_HOSTNAME = "hostname"
75+
)
76+
77+
var TKE_CLUSTER_NODE_NAME_TYPE = []string{TKE_CLUSTER_NODE_NAME_TYPE_LAN_IP, TKE_CLUSTER_NODE_NAME_TYPE_HOSTNAME}
78+
79+
const (
80+
TKE_CLUSTER_KUBE_PROXY_MODE_BPF = "kube-proxy-bpf"
81+
)
82+
83+
var TKE_CLUSTER_KUBE_PROXY_MODE = []string{TKE_CLUSTER_KUBE_PROXY_MODE_BPF}

‎tencentcloud/resource_tc_instance.go‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -191,17 +191,17 @@ func resourceTencentCloudInstance() *schema.Resource {
191191
"internet_charge_type": {
192192
Type: schema.TypeString,
193193
Optional: true,
194-
Default: CVM_INTERNET_CHARGE_TYPE_TRAFFIC_POSTPAID,
194+
Computed: true,
195195
ForceNew: true,
196196
ValidateFunc: validateAllowedStringValue(CVM_INTERNET_CHARGE_TYPE),
197-
Description: "Internet charge type of the instance, Valid values are `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `BANDWIDTH_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`. The default is `TRAFFIC_POSTPAID_BY_HOUR`.",
197+
Description: "Internet charge type of the instance, Valid values are `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `BANDWIDTH_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`. This value does not need to be set when `allocate_public_ip` is false.",
198198
},
199199
"internet_max_bandwidth_out": {
200200
Type: schema.TypeInt,
201201
Optional: true,
202-
Default: 0,
202+
Computed: true,
203203
ForceNew: true,
204-
Description: "Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bit per second). If this value is not specified, then automatically sets it to 0 Mbps.",
204+
Description: "Maximum outgoing bandwidth to the public network, measured in Mbps (Mega bit per second). This value does not need to be set when `allocate_public_ip` is false.",
205205
},
206206
"allocate_public_ip": {
207207
Type: schema.TypeBool,
@@ -961,6 +961,7 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
961961
cvmService := CvmService{
962962
client: meta.(*TencentCloudClient).apiV3Conn,
963963
}
964+
964965
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
965966
errRet := cvmService.DeleteInstance(ctx, instanceId)
966967
if errRet != nil {
@@ -976,7 +977,7 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
976977
notExist := false
977978

978979
//check exist
979-
err = resource.Retry(2*readRetryTimeout, func() *resource.RetryError {
980+
err = resource.Retry(5*readRetryTimeout, func() *resource.RetryError {
980981
instance, errRet := cvmService.DescribeInstanceById(ctx, instanceId)
981982
if errRet != nil {
982983
return retryError(errRet, InternalError)
@@ -985,13 +986,12 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
985986
notExist = true
986987
return nil
987988
}
988-
if *instance.InstanceState == CVM_STATUS_SHUTDOWN {
989+
if *instance.InstanceState == CVM_STATUS_SHUTDOWN && *instance.LatestOperationState != CVM_LATEST_OPERATION_STATE_OPERATING {
989990
//in recycling
990991
return nil
991992
}
992993
return resource.RetryableError(fmt.Errorf("cvm instance status is %s, retry...", *instance.InstanceState))
993994
})
994-
995995
if err != nil {
996996
return err
997997
}
@@ -1000,9 +1000,7 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
10001000
return nil
10011001
}
10021002

1003-
//exist in recycle
1004-
1005-
//delete again
1003+
// exist in recycle, delete again
10061004
err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
10071005
errRet := cvmService.DeleteInstance(ctx, instanceId)
10081006
//when state is terminating, do not delete but check exist
@@ -1024,7 +1022,7 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
10241022
}
10251023

10261024
//describe and check not exist
1027-
err = resource.Retry(2*readRetryTimeout, func() *resource.RetryError {
1025+
err = resource.Retry(5*readRetryTimeout, func() *resource.RetryError {
10281026
instance, errRet := cvmService.DescribeInstanceById(ctx, instanceId)
10291027
if errRet != nil {
10301028
return retryError(errRet, InternalError)
@@ -1034,10 +1032,9 @@ func resourceTencentCloudInstanceDelete(d *schema.ResourceData, meta interface{}
10341032
}
10351033
return resource.RetryableError(fmt.Errorf("cvm instance status is %s, retry...", *instance.InstanceState))
10361034
})
1037-
10381035
if err != nil {
10391036
return err
10401037
}
1041-
return nil
10421038

1039+
return nil
10431040
}

0 commit comments

Comments
 (0)