Skip to content

Commit 5d53099

Browse files
lyu571lyu571
committed
feat(tke): [120601766] support update_strategy
1 parent 509391e commit 5d53099

File tree

9 files changed

+68
-28
lines changed

9 files changed

+68
-28
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1034
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1034
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1038
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1014
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -91,7 +91,7 @@ require (
9191
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1013
94-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1031
94+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1038
9595
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674

‎go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -926,6 +926,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1031/go.mod
926926
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1033/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
927927
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1034 h1:T7ewuO2DD+5R2LRpD2kTRy25aCkVDVdYkmmyUS63i08=
928928
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1034/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
929+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1038 h1:tB3DLzyQXavvGTI+JUvEcuYh0EtTn1rvh9W6xxFHL38=
930+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1038/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
929931
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
930932
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
931933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -1030,6 +1032,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0d
10301032
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
10311033
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1031 h1:0Ew48YnVO+Sd2U3VrWgV36uRySTF7uOOFJH0Hd4ufhg=
10321034
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1031/go.mod h1:KcKTYEXZil0FciUtQ75svPL4hZpLYVnemAeW27N3OKY=
1035+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1038 h1:tmK0aSj8zJrTx7aubJR8DBvtySj1uO8UdFANUDFtbmo=
1036+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1038/go.mod h1:tWS3IluLYbNDx1kz8bBFEP6H1bxvuBPPGQ2WogD2rXI=
10331037
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947 h1:iZfuU8S86kfqFsAVT/LUApP8L5cpT90hl2wSKiUDVvw=
10341038
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947/go.mod h1:eAgJ+XUEhffMq79zjpgHoR3PBVcciSg+LuPDC8hLWsE=
10351039
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=

‎tencentcloud/services/tke/resource_tc_kubernetes_addon.go

Lines changed: 18 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tencentcloud/services/tke/resource_tc_kubernetes_addon.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ resource "tencentcloud_kubernetes_addon" "kubernetes_addon" {
2323
cluster_id = tencentcloud_kubernetes_cluster.example.id
2424
addon_name = "cos"
2525
addon_version = "2018-05-25"
26-
raw_values = "e30="
26+
raw_values = "{\"tolerations\":[{\"key\":\"test\",\"value\":\"100\",\"operator\":\"Equal\"}]}"
2727
}
2828
2929
```

‎tencentcloud/services/tke/resource_tc_kubernetes_addon_config.go

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ func ResourceTencentCloudKubernetesAddonConfig() *schema.Resource {
4242
Description: "Version of addon.",
4343
},
4444

45+
"update_strategy": {
46+
Type: schema.TypeString,
47+
Optional: true,
48+
Description: "The update strategy of Addon parameters. Valid values ​​are: `replace` and `merge`. The default value is merge, which is compatible with the old version API. `replace`: Use the new RawValues ​​to completely replace the original RawValues ​​of Addon. `merge`: Add or update the corresponding parameters in the original RawValues ​​of Addon according to the new RawValues.",
49+
},
50+
4551
"raw_values": {
4652
Type: schema.TypeString,
4753
Optional: true,
@@ -110,12 +116,13 @@ func resourceTencentCloudKubernetesAddonConfigRead(d *schema.ResourceData, meta
110116
_ = d.Set("addon_version", respData.AddonVersion)
111117
}
112118

113-
if respData.RawValues != nil {
114-
rawValues := respData.RawValues
115-
base64DecodeValues, _ := base64.StdEncoding.DecodeString(*rawValues)
116-
jsonValues := string(base64DecodeValues)
117-
_ = d.Set("raw_values", jsonValues)
118-
}
119+
// describe cannot return the correct raw_values when included the update_strategy
120+
// if respData.RawValues != nil {
121+
// rawValues := respData.RawValues
122+
// base64DecodeValues, _ := base64.StdEncoding.DecodeString(*rawValues)
123+
// jsonValues := string(base64DecodeValues)
124+
// _ = d.Set("raw_values", jsonValues)
125+
// }
119126

120127
if respData.Phase != nil {
121128
_ = d.Set("phase", respData.Phase)
@@ -145,7 +152,7 @@ func resourceTencentCloudKubernetesAddonConfigUpdate(d *schema.ResourceData, met
145152
addonName := idSplit[1]
146153

147154
needChange := false
148-
mutableArgs := []string{"addon_version", "raw_values"}
155+
mutableArgs := []string{"addon_version", "raw_values", "update_strategy"}
149156
for _, v := range mutableArgs {
150157
if d.HasChange(v) {
151158
needChange = true
@@ -169,6 +176,10 @@ func resourceTencentCloudKubernetesAddonConfigUpdate(d *schema.ResourceData, met
169176
request.RawValues = &rawValues
170177
}
171178

179+
if v, ok := d.GetOk("update_strategy"); ok {
180+
request.UpdateStrategy = helper.String(v.(string))
181+
}
182+
172183
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
173184
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().UpdateAddonWithContext(ctx, request)
174185
if e != nil {

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/models.go

Lines changed: 15 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20220501/models.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
11631163
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
11641164
## explicit; go 1.14
11651165
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
1166-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1034
1166+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1038
11671167
## explicit; go 1.11
11681168
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
11691169
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors
@@ -1324,7 +1324,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901
13241324
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998
13251325
## explicit; go 1.14
13261326
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc/v20230321
1327-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1031
1327+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1038
13281328
## explicit; go 1.14
13291329
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525
13301330
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20220501

0 commit comments

Comments
 (0)