Skip to content

Commit 42a91f6

Browse files
gailwanggailwang
authored
K8S version upgrade (#582)
1 parent e59359e commit 42a91f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1454
-80
lines changed

‎CHANGELOG.md

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
## 1.53.1 (Unreleased)
2+
3+
ENHANCEMENTS:
4+
5+
* Resource `tencentcloud_instance` add `throughput_performance` to support adding extra performance to the data disks.
6+
* Resource `tencentcloud_kubernetes_cluster_attachment` add `file_system`, `auto_format_and_mount` and `mount_target` to support advanced instance setting.
7+
* Resource `tencentcloud_kubernetes_node_pool` add `file_system`, `auto_format_and_mount` and `mount_target` to support advanced instance setting.
8+
* Resource `tencentcloud_kubernetes_node_pool` add `scaling_mode` to support scaling mode setting.
9+
* Resource `tencentcloud_kubernetes` support version upgrade.
10+
11+
BUG FIXES:
12+
13+
* Resource: `tencentcloud_gaap_http_rule` fix bug that exception happens when create more than one rule.
14+
215
## 1.53.0 (January 15, 2021)
316

417
FEATURES:
@@ -25,27 +38,11 @@ ENHANCEMENTS:
2538
FEATURES:
2639

2740
* **New Resource**: `tencentcloud_kubernetes_node_pool` to support node management.
28-
* **New Resource**: `tencentcloud_ssl_pay_certificate` to support ssl pay certificate.
2941

3042
DEPRECATED:
3143

3244
* Resource: `tencentcloud_kubernetes_as_scaling_group` replaced by `tencentcloud_kubernetes_node_pool`.
3345

34-
ENHANCEMENTS:
35-
36-
* Resource `tencentcloud_ccn` add `charge_type` to support billing mode setting.
37-
* Resource `tencentcloud_ccn` add `bandwidth_limit_type` to support the speed limit type setting.
38-
* Resource `tencentcloud_ccn_bandwidth_limit` add `dst_region` to support destination area restriction setting.
39-
* Resource `tencentcloud_cdn_domain` add `range_origin_switch` to support range back to source configuration.
40-
* Resource `tencentcloud_cdn_domain` add `rule_cache` to support advanced path cache configuration.
41-
* Resource `tencentcloud_cdn_domain` add `request_header` to support request header configuration.
42-
* Data Source `tencentcloud_ccn_instances` add `charge_type` to support billing mode.
43-
* Data Source `tencentcloud_ccn_instances` add `bandwidth_limit_type` to support the speed limit type.
44-
* Data Source `tencentcloud_ccn_bandwidth_limit` add `dst_region` to support destination area restriction.
45-
* Data Source `tencentcloud_cdn_domains` add `range_origin_switch` to support range back to source configuration.
46-
* Data Source `tencentcloud_cdn_domains` add `rule_cache` to support advanced path cache configuration.
47-
* Data Source `tencentcloud_cdn_domains` add `request_header` to support request header configuration.
48-
4946
## 1.51.1 (December 22, 2020)
5047

5148
ENHANCEMENTS:

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/mattn/go-colorable v0.1.6 // indirect
1616
github.com/mitchellh/go-homedir v1.1.0
1717
github.com/pkg/errors v0.9.1
18-
github.com/tencentcloud/tencentcloud-sdk-go v1.0.76
18+
github.com/tencentcloud/tencentcloud-sdk-go v1.0.88
1919
github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
2020
github.com/zclconf/go-cty v1.4.2 // indirect
2121
golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
441441
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
442442
github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
443443
github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
444-
github.com/tencentcloud/tencentcloud-sdk-go v1.0.76 h1:fVggxeCzlYcIliDjPKC4yGpbfQibWY6HmT9dbS7BKf8=
445-
github.com/tencentcloud/tencentcloud-sdk-go v1.0.76/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
444+
github.com/tencentcloud/tencentcloud-sdk-go v1.0.88 h1:PUrfD1dbgh/DC7YMZud27vBgLd6qq2BInHZvBg3vU3U=
445+
github.com/tencentcloud/tencentcloud-sdk-go v1.0.88/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
446446
github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
447447
github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
448448
github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

‎tencentcloud/resource_tc_gaap_domain_error_page.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ func resourceTencentCloudGaapDomainErrorPageInfo() *schema.Resource {
9999

100100
func resourceTencentCloudGaapDomainErrorPageInfoCreate(d *schema.ResourceData, m interface{}) error {
101101
defer logElapsed("resource.tencentcloud_gaap_domain_error_page.create")()
102+
gaapActionMu.Lock()
103+
defer gaapActionMu.Unlock()
104+
102105
logId := getLogId(contextNil)
103106
ctx := context.WithValue(context.TODO(), logIdKey, logId)
104107

@@ -183,6 +186,9 @@ func resourceTencentCloudGaapDomainErrorPageInfoRead(d *schema.ResourceData, m i
183186

184187
func resourceTencentCloudGaapDomainErrorPageInfoDelete(d *schema.ResourceData, m interface{}) error {
185188
defer logElapsed("resource.tencentcloud_gaap_domain_error_page.delete")()
189+
gaapActionMu.Lock()
190+
defer gaapActionMu.Unlock()
191+
186192
logId := getLogId(contextNil)
187193
ctx := context.WithValue(context.TODO(), logIdKey, logId)
188194

‎tencentcloud/resource_tc_gaap_http_domain.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ func resourceTencentCloudGaapHttpDomain() *schema.Resource {
153153

154154
func resourceTencentCloudGaapHttpDomainCreate(d *schema.ResourceData, m interface{}) error {
155155
defer logElapsed("resource.tencentcloud_gaap_http_domain.create")()
156+
gaapActionMu.Lock()
157+
defer gaapActionMu.Unlock()
158+
156159
logId := getLogId(contextNil)
157160
ctx := context.WithValue(context.TODO(), logIdKey, logId)
158161

@@ -388,6 +391,9 @@ func resourceTencentCloudGaapHttpDomainRead(d *schema.ResourceData, m interface{
388391

389392
func resourceTencentCloudGaapHttpDomainUpdate(d *schema.ResourceData, m interface{}) error {
390393
defer logElapsed("resource.tencentcloud_gaap_http_domain.update")()
394+
gaapActionMu.Lock()
395+
defer gaapActionMu.Unlock()
396+
391397
logId := getLogId(contextNil)
392398
ctx := context.WithValue(context.TODO(), logIdKey, logId)
393399

@@ -600,6 +606,9 @@ func resourceTencentCloudGaapHttpDomainUpdate(d *schema.ResourceData, m interfac
600606

601607
func resourceTencentCloudGaapHttpDomainDelete(d *schema.ResourceData, m interface{}) error {
602608
defer logElapsed("resource.tencentcloud_gaap_http_domain.delete")()
609+
gaapActionMu.Lock()
610+
defer gaapActionMu.Unlock()
611+
603612
logId := getLogId(contextNil)
604613
ctx := context.WithValue(context.TODO(), logIdKey, logId)
605614

‎tencentcloud/resource_tc_gaap_http_rule.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@ func resourceTencentCloudGaapHttpRule() *schema.Resource {
226226

227227
func resourceTencentCloudGaapHttpRuleCreate(d *schema.ResourceData, m interface{}) error {
228228
defer logElapsed("resource.tencentcloud_gaap_http_rule.create")()
229+
gaapActionMu.Lock()
230+
defer gaapActionMu.Unlock()
231+
229232
logId := getLogId(contextNil)
230233
ctx := context.WithValue(context.TODO(), logIdKey, logId)
231234

@@ -356,6 +359,9 @@ func resourceTencentCloudGaapHttpRuleRead(d *schema.ResourceData, m interface{})
356359

357360
func resourceTencentCloudGaapHttpRuleUpdate(d *schema.ResourceData, m interface{}) error {
358361
defer logElapsed("resource.tencentcloud_gaap_http_rule.update")()
362+
gaapActionMu.Lock()
363+
defer gaapActionMu.Unlock()
364+
359365
logId := getLogId(contextNil)
360366
ctx := context.WithValue(context.TODO(), logIdKey, logId)
361367

@@ -482,6 +488,9 @@ func resourceTencentCloudGaapHttpRuleUpdate(d *schema.ResourceData, m interface{
482488

483489
func resourceTencentCloudGaapHttpRuleDelete(d *schema.ResourceData, m interface{}) error {
484490
defer logElapsed("resource.tencentcloud_gaap_http_rule.delete")()
491+
gaapActionMu.Lock()
492+
defer gaapActionMu.Unlock()
493+
485494
logId := getLogId(contextNil)
486495
ctx := context.WithValue(context.TODO(), logIdKey, logId)
487496

‎tencentcloud/resource_tc_gaap_layer4_listener.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ func resourceTencentCloudGaapLayer4Listener() *schema.Resource {
189189

190190
func resourceTencentCloudGaapLayer4ListenerCreate(d *schema.ResourceData, m interface{}) error {
191191
defer logElapsed("resource.tencentcloud_gaap_layer4_listener.create")()
192+
gaapActionMu.Lock()
193+
defer gaapActionMu.Unlock()
194+
192195
logId := getLogId(contextNil)
193196
ctx := context.WithValue(context.TODO(), logIdKey, logId)
194197

@@ -397,6 +400,9 @@ func resourceTencentCloudGaapLayer4ListenerRead(d *schema.ResourceData, m interf
397400

398401
func resourceTencentCloudGaapLayer4ListenerUpdate(d *schema.ResourceData, m interface{}) error {
399402
defer logElapsed("resource.tencentcloud_gaap_layer4_listener.update")()
403+
gaapActionMu.Lock()
404+
defer gaapActionMu.Unlock()
405+
400406
logId := getLogId(contextNil)
401407
ctx := context.WithValue(context.TODO(), logIdKey, logId)
402408

@@ -493,6 +499,9 @@ func resourceTencentCloudGaapLayer4ListenerUpdate(d *schema.ResourceData, m inte
493499

494500
func resourceTencentCloudGaapLayer4ListenerDelete(d *schema.ResourceData, m interface{}) error {
495501
defer logElapsed("resource.tencentcloud_gaap_layer4_listener.delete")()
502+
gaapActionMu.Lock()
503+
defer gaapActionMu.Unlock()
504+
496505
logId := getLogId(contextNil)
497506
ctx := context.WithValue(context.TODO(), logIdKey, logId)
498507

‎tencentcloud/resource_tc_gaap_layer7_listener.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ func resourceTencentCloudGaapLayer7Listener() *schema.Resource {
131131

132132
func resourceTencentCloudGaapLayer7ListenerCreate(d *schema.ResourceData, m interface{}) error {
133133
defer logElapsed("resource.tencentcloud_gaap_layer7_listener.create")()
134+
gaapActionMu.Lock()
135+
defer gaapActionMu.Unlock()
136+
134137
logId := getLogId(contextNil)
135138
ctx := context.WithValue(context.TODO(), logIdKey, logId)
136139

@@ -352,6 +355,9 @@ LOOP:
352355

353356
func resourceTencentCloudGaapLayer7ListenerUpdate(d *schema.ResourceData, m interface{}) error {
354357
defer logElapsed("resource.tencentcloud_gaap_layer7_listener.update")()
358+
gaapActionMu.Lock()
359+
defer gaapActionMu.Unlock()
360+
355361
logId := getLogId(contextNil)
356362
ctx := context.WithValue(context.TODO(), logIdKey, logId)
357363

‎tencentcloud/resource_tc_gaap_proxy.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"errors"
3333
"fmt"
3434
"log"
35+
"sync"
3536
"time"
3637

3738
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -40,6 +41,8 @@ import (
4041
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
4142
)
4243

44+
var gaapActionMu = &sync.Mutex{}
45+
4346
func resourceTencentCloudGaapProxy() *schema.Resource {
4447
return &schema.Resource{
4548
Create: resourceTencentCloudGaapProxyCreate,
@@ -144,6 +147,7 @@ func resourceTencentCloudGaapProxy() *schema.Resource {
144147

145148
func resourceTencentCloudGaapProxyCreate(d *schema.ResourceData, m interface{}) error {
146149
defer logElapsed("resource.tencentcloud_gaap_proxy.create")()
150+
147151
logId := getLogId(contextNil)
148152
ctx := context.WithValue(context.TODO(), logIdKey, logId)
149153

@@ -289,6 +293,7 @@ func resourceTencentCloudGaapProxyRead(d *schema.ResourceData, m interface{}) er
289293

290294
func resourceTencentCloudGaapProxyUpdate(d *schema.ResourceData, m interface{}) error {
291295
defer logElapsed("resource.tencentcloud_gaap_proxy.update")()
296+
292297
logId := getLogId(contextNil)
293298
ctx := context.WithValue(context.TODO(), logIdKey, logId)
294299

@@ -373,6 +378,9 @@ func resourceTencentCloudGaapProxyUpdate(d *schema.ResourceData, m interface{})
373378

374379
func resourceTencentCloudGaapProxyDelete(d *schema.ResourceData, m interface{}) error {
375380
defer logElapsed("resource.tencentcloud_gaap_proxy.update")()
381+
//gaapActionMu.Lock()
382+
//defer gaapActionMu.Unlock()
383+
376384
logId := getLogId(contextNil)
377385
ctx := context.WithValue(context.TODO(), logIdKey, logId)
378386

‎tencentcloud/resource_tc_gaap_security_policy.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ func resourceTencentCloudGaapSecurityPolicy() *schema.Resource {
7070

7171
func resourceTencentCloudGaapSecurityPolicyCreate(d *schema.ResourceData, m interface{}) error {
7272
defer logElapsed("resource.tencentcloud_gaap_security_policy.create")()
73+
gaapActionMu.Lock()
74+
defer gaapActionMu.Unlock()
75+
7376
logId := getLogId(contextNil)
7477
ctx := context.WithValue(context.TODO(), logIdKey, logId)
7578

@@ -125,6 +128,9 @@ func resourceTencentCloudGaapSecurityPolicyRead(d *schema.ResourceData, m interf
125128

126129
func resourceTencentCloudGaapSecurityPolicyUpdate(d *schema.ResourceData, m interface{}) error {
127130
defer logElapsed("resource.tencentcloud_gaap_security_policy.update")()
131+
gaapActionMu.Lock()
132+
defer gaapActionMu.Unlock()
133+
128134
logId := getLogId(contextNil)
129135
ctx := context.WithValue(context.TODO(), logIdKey, logId)
130136

@@ -149,6 +155,9 @@ func resourceTencentCloudGaapSecurityPolicyUpdate(d *schema.ResourceData, m inte
149155

150156
func resourceTencentCloudGaapSecurityPolicyDelete(d *schema.ResourceData, m interface{}) error {
151157
defer logElapsed("resource.tencentcloud_gaap_security_policy.delete")()
158+
gaapActionMu.Lock()
159+
defer gaapActionMu.Unlock()
160+
152161
logId := getLogId(contextNil)
153162
ctx := context.WithValue(context.TODO(), logIdKey, logId)
154163

0 commit comments

Comments
 (0)