Skip to content

Commit 2a33120

Browse files
lyu571lyu571
authored
feat(tke): [116855855]add tencentcloud_kubernetes_addon (#2624)
* feat(tke): [116855855]add tencentcloud_kubernetes_addon * add doc * 1.adjust format. 2.add changelog * resolve conflict * 1.add base64 support. 2.add update e2e
1 parent 13f21be commit 2a33120

File tree

17 files changed

+4408
-3249
lines changed

17 files changed

+4408
-3249
lines changed

‎.changelog/2624.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
tencentcloud_kubernetes_addon
3+
```

‎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.860
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.860
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
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.825
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758
94-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.807
94+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916
9595
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,8 +924,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.860/go.mod
924924
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.873/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
925925
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888 h1:FqVcZ+POUhckq6ZRlwOR819fsXp49YyizpmWZJYAAGg=
926926
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
927-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910 h1:u+rAnHhLixQaNYy8vtnuClj4kYWs77VAHEbi9jl8k/4=
928-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
927+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916 h1:30u2fFUGxaPB0VFpVtomiziXATxm/MjG53HCobM8KGI=
928+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
929929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
930930
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
931931
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
@@ -1024,6 +1024,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758 h1:PRxMkSm
10241024
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758/go.mod h1:GKX+ZVvPOgussCe/4hAreiglWRa5w9PTDKoxedZ3Wc4=
10251025
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.807 h1:/ziV4FFD7xGFvS4TEFEMRvVtfhl2cQ4vkejOwDwWTqc=
10261026
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.807/go.mod h1:uRsVm3rUbE/YH4+G8o1Ppyl4ENtbLWliUxPk1yDr95k=
1027+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916 h1:/ERZ1hNzLfbtvOqjydV9291yC/try3gSJGsrnmT36Xs=
1028+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916/go.mod h1:fhRshMGZ9Y+yDte3knOAlXhUQApfhhq5reebRFHi6VA=
10271029
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756 h1:89M6uA8Y/FC1b88TFxvRManGW+i62Isqg1lW8HjHDvU=
10281030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756/go.mod h1:AJAItBOTaarpDpUF7pNp0tuz2Y6H2oFuMcyKouPs1IE=
10291031
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=

‎tencentcloud/common/context.go

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package common
2+
3+
import (
4+
"context"
5+
6+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
7+
)
8+
9+
type ctxResourceDataKey struct{}
10+
type ctxProviderMetaKey struct{}
11+
12+
// NewResourceLifeCycleHandleFuncContext 创建一个资源生命周期处理方法上下文
13+
func NewResourceLifeCycleHandleFuncContext(
14+
parent context.Context,
15+
logID string,
16+
d *schema.ResourceData,
17+
meta interface{},
18+
) context.Context {
19+
ctx := context.WithValue(parent, LogIdKey, logID)
20+
ctx = context.WithValue(ctx, ctxResourceDataKey{}, d)
21+
ctx = context.WithValue(ctx, ctxProviderMetaKey{}, meta)
22+
return ctx
23+
}
24+
25+
// ResourceDataFromContext 从上下文获取资源数据
26+
func ResourceDataFromContext(ctx context.Context) *schema.ResourceData {
27+
if d, ok := ctx.Value(ctxResourceDataKey{}).(*schema.ResourceData); ok {
28+
return d
29+
}
30+
return nil
31+
}
32+
33+
// ProviderMetaFromContext 从上下文获取 provider meta
34+
func ProviderMetaFromContext(ctx context.Context) interface{} {
35+
if meta, ok := ctx.Value(ctxProviderMetaKey{}).(ProviderMeta); ok {
36+
return meta
37+
}
38+
return nil
39+
}

‎tencentcloud/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1971,7 +1971,7 @@ func Provider() *schema.Provider {
19711971
"tencentcloud_csip_risk_center": csip.ResourceTencentCloudCsipRiskCenter(),
19721972
"tencentcloud_organization_org_share_unit_member": tco.ResourceTencentCloudOrganizationOrgShareUnitMember(),
19731973
"tencentcloud_organization_org_share_unit": tco.ResourceTencentCloudOrganizationOrgShareUnit(),
1974-
},
1974+
"tencentcloud_kubernetes_addon": tke.ResourceTencentCloudKubernetesAddon()},
19751975

19761976
ConfigureFunc: providerConfigure,
19771977
}

‎tencentcloud/provider.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,7 @@ Tencent Kubernetes Engine(TKE)
669669
tencentcloud_kubernetes_auth_attachment
670670
tencentcloud_kubernetes_addon_attachment
671671
tencentcloud_kubernetes_cluster_endpoint
672+
tencentcloud_kubernetes_addon
672673

673674
TDMQ for Pulsar(tpulsar)
674675
Data Source

‎tencentcloud/services/tke/resource_tc_kubernetes_addon.go

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

0 commit comments

Comments
 (0)