diff --git a/.changelog/2896.txt b/.changelog/2896.txt
new file mode 100644
index 0000000000..968a45fff6
--- /dev/null
+++ b/.changelog/2896.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_kubernetes_cluster: adjust TKE tags logic to support existing native nodes
+```
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 3fdeeb9d35..abf98addad 100644
--- a/go.mod
+++ b/go.mod
@@ -46,7 +46,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.984
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
- github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1018
+ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1027
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1014
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
@@ -91,7 +91,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1013
- github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008
+ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1027
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674
diff --git a/go.sum b/go.sum
index 8f69b7a19c..c22d9202cf 100644
--- a/go.sum
+++ b/go.sum
@@ -933,6 +933,12 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1016 h1:gFA
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1016/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1018 h1:PjTcH8XozO53JcLt7Vm4/RIeH7vKS/AZuGERl/4ehdM=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1018/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1024 h1:Xexz/KT0061zBvfzlk4AH8ObaPOmV0cqvXw0uItPtoI=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1024/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1025 h1:VBCr8GCiZioqKepLH78Al6PQLhLno9ExtF2U32m/hHY=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1025/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1027 h1:4/chUqYM26idp2Rd3pPmsL94RTAwIM5dGXoaskOQ+cM=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1027/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -1037,6 +1043,12 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0d
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008 h1:Cz7JSuS2zxIBzAuZ2bKk3EmrZ1QgS2QAHmCDTDPWBz0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008/go.mod h1:71PkDdVPT2Pd8yiuX6QFUDReTji39R/03dg1JwcjHWo=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1024 h1:7g3dTZb+QbiZR2mFv6i5cE2pMMx1+Q4FMOZSxE4lUu4=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1024/go.mod h1:2xDvw52Z3FwGuFadvpIGd42J9myl/RKqROAlelctOVA=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1025 h1:KQTBLtkU6VEKMJfPcyh4WiLybxxvq0BBYRi7q5/aD3A=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1025/go.mod h1:WBsBVG3Qb9bupdElk/d/S7xLadGwyBvKF2VikkezhjE=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1027 h1:CCbjHzYueJMa6O3aH2zn/Uppp+u7YJSd7oTrtypxGhM=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1027/go.mod h1:U0WwaLeMZf4Qx1SGG6TlFBhwlV03BMF5F176G14W9Qc=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947 h1:iZfuU8S86kfqFsAVT/LUApP8L5cpT90hl2wSKiUDVvw=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947/go.mod h1:eAgJ+XUEhffMq79zjpgHoR3PBVcciSg+LuPDC8hLWsE=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=
diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_cluster_extension.go b/tencentcloud/services/tke/resource_tc_kubernetes_cluster_extension.go
index 6500ab7bde..34b7a3b34c 100644
--- a/tencentcloud/services/tke/resource_tc_kubernetes_cluster_extension.go
+++ b/tencentcloud/services/tke/resource_tc_kubernetes_cluster_extension.go
@@ -13,13 +13,13 @@ import (
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
+ tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http"
cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
svcas "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/as"
svccvm "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/cvm"
- svctag "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -1172,10 +1172,7 @@ func resourceTencentCloudKubernetesClusterUpdateOnStart(ctx context.Context) err
d := tccommon.ResourceDataFromContext(ctx)
meta := tccommon.ProviderMetaFromContext(ctx)
- client := meta.(tccommon.ProviderMeta).GetAPIV3Conn()
- service := svctag.NewTagService(client)
tkeService := TkeService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
- region := client.Region
d.Partial(true)
id := d.Id()
@@ -1185,11 +1182,25 @@ func resourceTencentCloudKubernetesClusterUpdateOnStart(ctx context.Context) err
}
if d.HasChange("tags") {
- oldTags, newTags := d.GetChange("tags")
- replaceTags, deleteTags := svctag.DiffTags(oldTags.(map[string]interface{}), newTags.(map[string]interface{}))
+ if err := modifyClusterTags(ctx); err != nil {
+ return err
+ }
- resourceName := tccommon.BuildTagResourceName("ccs", "cluster", region, id)
- if err := service.ModifyTags(ctx, resourceName, replaceTags, deleteTags); err != nil {
+ // wait for tags ok
+ err := resource.Retry(5*tccommon.ReadRetryTimeout, func() *resource.RetryError {
+ request := tke.NewDescribeBatchModifyTagsStatusRequest()
+ request.ClusterId = &id
+ resp, errRet := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().DescribeBatchModifyTagsStatus(request)
+ if errRet != nil {
+ return tccommon.RetryError(errRet, tccommon.InternalError)
+ }
+ // TaskFailed = "failed"; TaskRunning = "running"; TaskDone = "done"
+ if resp != nil && *resp.Response.Status == "done" {
+ return nil
+ }
+ return resource.RetryableError(fmt.Errorf("modify tags status is %s, retry...", *resp.Response.Status))
+ })
+ if err != nil {
return err
}
@@ -1640,6 +1651,39 @@ func ResourceTkeGetAddonsDiffs(o, n []interface{}) (adds, removes, changes []int
return
}
+func modifyClusterTags(ctx context.Context) error {
+ d := tccommon.ResourceDataFromContext(ctx)
+ meta := tccommon.ProviderMetaFromContext(ctx)
+ logId := tccommon.GetLogId(ctx)
+
+ id := d.Id()
+ tags := GetTkeTags(d, "tags")
+ body := map[string]interface{}{
+ "ClusterId": id,
+ "SyncSubresource": false,
+ "Tags": tags,
+ }
+
+ client := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseOmitNilClient("tke")
+ request := tchttp.NewCommonRequest("tke", "2018-05-25", "ModifyClusterTags")
+ err := request.SetActionParameters(body)
+ if err != nil {
+ return err
+ }
+
+ response := tchttp.NewCommonResponse()
+ err = client.Send(request, response)
+ if err != nil {
+ fmt.Printf("Modify Cluster Tags failed: %v \n", err)
+ return err
+ }
+ reqBody, _ := request.MarshalJSON()
+ respBody := response.GetBody()
+
+ log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), string(reqBody), string(respBody))
+ return nil
+}
+
// upgradeClusterInstances upgrade instances, upgrade type try seq:major, hot.
func upgradeClusterInstances(tkeService TkeService, ctx context.Context, id string) error {
// get all available instances for upgrade
diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go
index 6122d5bf18..a38b8081e1 100644
--- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go
+++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go
@@ -265,7 +265,7 @@ func CompleteCommonParams(request Request, region string, requestClient string)
params["Action"] = request.GetAction()
params["Timestamp"] = strconv.FormatInt(time.Now().Unix(), 10)
params["Nonce"] = strconv.Itoa(rand.Int())
- params["RequestClient"] = "SDK_GO_1.0.1018"
+ params["RequestClient"] = "SDK_GO_1.0.1027"
if requestClient != "" {
params["RequestClient"] += ": " + requestClient
}
diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/client.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/client.go
index 7850ddd1a6..69b74cc88b 100644
--- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/client.go
+++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/client.go
@@ -5170,6 +5170,55 @@ func (c *Client) DescribeBackupStorageLocationsWithContext(ctx context.Context,
return
}
+func NewDescribeBatchModifyTagsStatusRequest() (request *DescribeBatchModifyTagsStatusRequest) {
+ request = &DescribeBatchModifyTagsStatusRequest{
+ BaseRequest: &tchttp.BaseRequest{},
+ }
+
+ request.Init().WithApiInfo("tke", APIVersion, "DescribeBatchModifyTagsStatus")
+
+
+ return
+}
+
+func NewDescribeBatchModifyTagsStatusResponse() (response *DescribeBatchModifyTagsStatusResponse) {
+ response = &DescribeBatchModifyTagsStatusResponse{
+ BaseResponse: &tchttp.BaseResponse{},
+ }
+ return
+
+}
+
+// DescribeBatchModifyTagsStatus
+// 查询批量修改标签状态
+//
+// 可能返回的错误码:
+// FAILEDOPERATION_TASKNOTFOUND = "FailedOperation.TaskNotFound"
+func (c *Client) DescribeBatchModifyTagsStatus(request *DescribeBatchModifyTagsStatusRequest) (response *DescribeBatchModifyTagsStatusResponse, err error) {
+ return c.DescribeBatchModifyTagsStatusWithContext(context.Background(), request)
+}
+
+// DescribeBatchModifyTagsStatus
+// 查询批量修改标签状态
+//
+// 可能返回的错误码:
+// FAILEDOPERATION_TASKNOTFOUND = "FailedOperation.TaskNotFound"
+func (c *Client) DescribeBatchModifyTagsStatusWithContext(ctx context.Context, request *DescribeBatchModifyTagsStatusRequest) (response *DescribeBatchModifyTagsStatusResponse, err error) {
+ if request == nil {
+ request = NewDescribeBatchModifyTagsStatusRequest()
+ }
+
+ if c.GetCredential() == nil {
+ return nil, errors.New("DescribeBatchModifyTagsStatus require credential")
+ }
+
+ request.SetContext(ctx)
+
+ response = NewDescribeBatchModifyTagsStatusResponse()
+ err = c.Send(request, response)
+ return
+}
+
func NewDescribeClusterAsGroupOptionRequest() (request *DescribeClusterAsGroupOptionRequest) {
request = &DescribeClusterAsGroupOptionRequest{
BaseRequest: &tchttp.BaseRequest{},
@@ -8107,91 +8156,6 @@ func (c *Client) DescribeExistedInstancesWithContext(ctx context.Context, reques
return
}
-func NewDescribeExternalClusterSpecRequest() (request *DescribeExternalClusterSpecRequest) {
- request = &DescribeExternalClusterSpecRequest{
- BaseRequest: &tchttp.BaseRequest{},
- }
-
- request.Init().WithApiInfo("tke", APIVersion, "DescribeExternalClusterSpec")
-
-
- return
-}
-
-func NewDescribeExternalClusterSpecResponse() (response *DescribeExternalClusterSpecResponse) {
- response = &DescribeExternalClusterSpecResponse{
- BaseResponse: &tchttp.BaseResponse{},
- }
- return
-
-}
-
-// DescribeExternalClusterSpec
-// tdcc接口已迁移至tdcc产品下，tke下的接口下线
-//
-//
-//
-// 获取导入第三方集群YAML定义
-//
-// 可能返回的错误码:
-// INTERNALERROR = "InternalError"
-// INTERNALERROR_CAMNOAUTH = "InternalError.CamNoAuth"
-// INTERNALERROR_DB = "InternalError.Db"
-// INTERNALERROR_KUBERNETESCLIENTBUILDERROR = "InternalError.KubernetesClientBuildError"
-// INTERNALERROR_KUBERNETESCREATEOPERATIONERROR = "InternalError.KubernetesCreateOperationError"
-// INTERNALERROR_KUBERNETESDELETEOPERATIONERROR = "InternalError.KubernetesDeleteOperationError"
-// INTERNALERROR_UNEXPECTEDINTERNAL = "InternalError.UnexpectedInternal"
-// INTERNALERROR_WHITELISTUNEXPECTEDERROR = "InternalError.WhitelistUnexpectedError"
-// INVALIDPARAMETER = "InvalidParameter"
-// INVALIDPARAMETER_CLUSTERNOTFOUND = "InvalidParameter.ClusterNotFound"
-// INVALIDPARAMETER_PARAM = "InvalidParameter.Param"
-// RESOURCENOTFOUND_CLUSTERNOTFOUND = "ResourceNotFound.ClusterNotFound"
-// RESOURCENOTFOUND_KUBERNETESRESOURCENOTFOUND = "ResourceNotFound.KubernetesResourceNotFound"
-// RESOURCEUNAVAILABLE_CLUSTERSTATE = "ResourceUnavailable.ClusterState"
-// UNAUTHORIZEDOPERATION_CAMNOAUTH = "UnauthorizedOperation.CamNoAuth"
-func (c *Client) DescribeExternalClusterSpec(request *DescribeExternalClusterSpecRequest) (response *DescribeExternalClusterSpecResponse, err error) {
- return c.DescribeExternalClusterSpecWithContext(context.Background(), request)
-}
-
-// DescribeExternalClusterSpec
-// tdcc接口已迁移至tdcc产品下，tke下的接口下线
-//
-//
-//
-// 获取导入第三方集群YAML定义
-//
-// 可能返回的错误码:
-// INTERNALERROR = "InternalError"
-// INTERNALERROR_CAMNOAUTH = "InternalError.CamNoAuth"
-// INTERNALERROR_DB = "InternalError.Db"
-// INTERNALERROR_KUBERNETESCLIENTBUILDERROR = "InternalError.KubernetesClientBuildError"
-// INTERNALERROR_KUBERNETESCREATEOPERATIONERROR = "InternalError.KubernetesCreateOperationError"
-// INTERNALERROR_KUBERNETESDELETEOPERATIONERROR = "InternalError.KubernetesDeleteOperationError"
-// INTERNALERROR_UNEXPECTEDINTERNAL = "InternalError.UnexpectedInternal"
-// INTERNALERROR_WHITELISTUNEXPECTEDERROR = "InternalError.WhitelistUnexpectedError"
-// INVALIDPARAMETER = "InvalidParameter"
-// INVALIDPARAMETER_CLUSTERNOTFOUND = "InvalidParameter.ClusterNotFound"
-// INVALIDPARAMETER_PARAM = "InvalidParameter.Param"
-// RESOURCENOTFOUND_CLUSTERNOTFOUND = "ResourceNotFound.ClusterNotFound"
-// RESOURCENOTFOUND_KUBERNETESRESOURCENOTFOUND = "ResourceNotFound.KubernetesResourceNotFound"
-// RESOURCEUNAVAILABLE_CLUSTERSTATE = "ResourceUnavailable.ClusterState"
-// UNAUTHORIZEDOPERATION_CAMNOAUTH = "UnauthorizedOperation.CamNoAuth"
-func (c *Client) DescribeExternalClusterSpecWithContext(ctx context.Context, request *DescribeExternalClusterSpecRequest) (response *DescribeExternalClusterSpecResponse, err error) {
- if request == nil {
- request = NewDescribeExternalClusterSpecRequest()
- }
-
- if c.GetCredential() == nil {
- return nil, errors.New("DescribeExternalClusterSpec require credential")
- }
-
- request.SetContext(ctx)
-
- response = NewDescribeExternalClusterSpecResponse()
- err = c.Send(request, response)
- return
-}
-
func NewDescribeExternalNodeSupportConfigRequest() (request *DescribeExternalNodeSupportConfigRequest) {
request = &DescribeExternalNodeSupportConfigRequest{
BaseRequest: &tchttp.BaseRequest{},
@@ -12869,6 +12833,65 @@ func (c *Client) ModifyClusterRuntimeConfigWithContext(ctx context.Context, requ
return
}
+func NewModifyClusterTagsRequest() (request *ModifyClusterTagsRequest) {
+ request = &ModifyClusterTagsRequest{
+ BaseRequest: &tchttp.BaseRequest{},
+ }
+
+ request.Init().WithApiInfo("tke", APIVersion, "ModifyClusterTags")
+
+
+ return
+}
+
+func NewModifyClusterTagsResponse() (response *ModifyClusterTagsResponse) {
+ response = &ModifyClusterTagsResponse{
+ BaseResponse: &tchttp.BaseResponse{},
+ }
+ return
+
+}
+
+// ModifyClusterTags
+// 修改集群标签
+//
+// 可能返回的错误码:
+// FAILEDOPERATION_TASKNOTFOUND = "FailedOperation.TaskNotFound"
+// FAILEDOPERATION_TRADECOMMON = "FailedOperation.TradeCommon"
+// INTERNALERROR = "InternalError"
+// INTERNALERROR_PARAM = "InternalError.Param"
+// INTERNALERROR_TASKCREATEFAILED = "InternalError.TaskCreateFailed"
+// INVALIDPARAMETER_PARAM = "InvalidParameter.Param"
+func (c *Client) ModifyClusterTags(request *ModifyClusterTagsRequest) (response *ModifyClusterTagsResponse, err error) {
+ return c.ModifyClusterTagsWithContext(context.Background(), request)
+}
+
+// ModifyClusterTags
+// 修改集群标签
+//
+// 可能返回的错误码:
+// FAILEDOPERATION_TASKNOTFOUND = "FailedOperation.TaskNotFound"
+// FAILEDOPERATION_TRADECOMMON = "FailedOperation.TradeCommon"
+// INTERNALERROR = "InternalError"
+// INTERNALERROR_PARAM = "InternalError.Param"
+// INTERNALERROR_TASKCREATEFAILED = "InternalError.TaskCreateFailed"
+// INVALIDPARAMETER_PARAM = "InvalidParameter.Param"
+func (c *Client) ModifyClusterTagsWithContext(ctx context.Context, request *ModifyClusterTagsRequest) (response *ModifyClusterTagsResponse, err error) {
+ if request == nil {
+ request = NewModifyClusterTagsRequest()
+ }
+
+ if c.GetCredential() == nil {
+ return nil, errors.New("ModifyClusterTags require credential")
+ }
+
+ request.SetContext(ctx)
+
+ response = NewModifyClusterTagsResponse()
+ err = c.Send(request, response)
+ return
+}
+
func NewModifyClusterVirtualNodePoolRequest() (request *ModifyClusterVirtualNodePoolRequest) {
request = &ModifyClusterVirtualNodePoolRequest{
BaseRequest: &tchttp.BaseRequest{},
diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/errors.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/errors.go
index 11ba09df32..218ddc5f73 100644
--- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/errors.go
+++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/errors.go
@@ -224,6 +224,9 @@ const (
// 任务当前所处状态不支持此操作。
FAILEDOPERATION_TASKLIFESTATEERROR = "FailedOperation.TaskLifeStateError"
+ // 任务未找到。
+ FAILEDOPERATION_TASKNOTFOUND = "FailedOperation.TaskNotFound"
+
// 询价错误。
FAILEDOPERATION_TRADECOMMON = "FailedOperation.TradeCommon"
diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/models.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/models.go
index a543a1fa77..ca760015d8 100644
--- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/models.go
+++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/models.go
@@ -6597,6 +6597,77 @@ func (r *DescribeBackupStorageLocationsResponse) FromJsonString(s string) error
return json.Unmarshal([]byte(s), &r)
}
+// Predefined struct for user
+type DescribeBatchModifyTagsStatusRequestParams struct {
+ // 集群id
+ ClusterId *string `json:"ClusterId,omitnil,omitempty" name:"ClusterId"`
+}
+
+type DescribeBatchModifyTagsStatusRequest struct {
+ *tchttp.BaseRequest
+
+ // 集群id
+ ClusterId *string `json:"ClusterId,omitnil,omitempty" name:"ClusterId"`
+}
+
+func (r *DescribeBatchModifyTagsStatusRequest) ToJsonString() string {
+ b, _ := json.Marshal(r)
+ return string(b)
+}
+
+// FromJsonString It is highly **NOT** recommended to use this function
+// because it has no param check, nor strict type check
+func (r *DescribeBatchModifyTagsStatusRequest) FromJsonString(s string) error {
+ f := make(map[string]interface{})
+ if err := json.Unmarshal([]byte(s), &f); err != nil {
+ return err
+ }
+ delete(f, "ClusterId")
+ if len(f) > 0 {
+ return tcerr.NewTencentCloudSDKError("ClientError.BuildRequestError", "DescribeBatchModifyTagsStatusRequest has unknown keys!", "")
+ }
+ return json.Unmarshal([]byte(s), &r)
+}
+
+// Predefined struct for user
+type DescribeBatchModifyTagsStatusResponseParams struct {
+ // 失败资源列表
+ // 注意：此字段可能返回 null，表示取不到有效值。
+ FailedResources []*FailedResource `json:"FailedResources,omitnil,omitempty" name:"FailedResources"`
+
+ // 任务状态：
+ // - running 运行中
+ // - failed 失败
+ // - done 成功
+ // 注意：此字段可能返回 null，表示取不到有效值。
+ Status *string `json:"Status,omitnil,omitempty" name:"Status"`
+
+ // 是否同步集群内子资源标签
+ SyncSubresource *bool `json:"SyncSubresource,omitnil,omitempty" name:"SyncSubresource"`
+
+ // 集群标签
+ Tags []*Tag `json:"Tags,omitnil,omitempty" name:"Tags"`
+
+ // 唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。
+ RequestId *string `json:"RequestId,omitnil,omitempty" name:"RequestId"`
+}
+
+type DescribeBatchModifyTagsStatusResponse struct {
+ *tchttp.BaseResponse
+ Response *DescribeBatchModifyTagsStatusResponseParams `json:"Response"`
+}
+
+func (r *DescribeBatchModifyTagsStatusResponse) ToJsonString() string {
+ b, _ := json.Marshal(r)
+ return string(b)
+}
+
+// FromJsonString It is highly **NOT** recommended to use this function
+// because it has no param check, nor strict type check
+func (r *DescribeBatchModifyTagsStatusResponse) FromJsonString(s string) error {
+ return json.Unmarshal([]byte(s), &r)
+}
+
// Predefined struct for user
type DescribeClusterAsGroupOptionRequestParams struct {
// 集群ID
@@ -9820,80 +9891,6 @@ func (r *DescribeExistedInstancesResponse) FromJsonString(s string) error {
return json.Unmarshal([]byte(s), &r)
}
-// Predefined struct for user
-type DescribeExternalClusterSpecRequestParams struct {
- // 注册集群ID
- ClusterId *string `json:"ClusterId,omitnil,omitempty" name:"ClusterId"`
-
- // 默认false 获取内网，是否获取外网版注册命令
- IsExtranet *bool `json:"IsExtranet,omitnil,omitempty" name:"IsExtranet"`
-
- // 默认false 不刷新有效时间 ，true刷新有效时间
- IsRefreshExpirationTime *bool `json:"IsRefreshExpirationTime,omitnil,omitempty" name:"IsRefreshExpirationTime"`
-}
-
-type DescribeExternalClusterSpecRequest struct {
- *tchttp.BaseRequest
-
- // 注册集群ID
- ClusterId *string `json:"ClusterId,omitnil,omitempty" name:"ClusterId"`
-
- // 默认false 获取内网，是否获取外网版注册命令
- IsExtranet *bool `json:"IsExtranet,omitnil,omitempty" name:"IsExtranet"`
-
- // 默认false 不刷新有效时间 ，true刷新有效时间
- IsRefreshExpirationTime *bool `json:"IsRefreshExpirationTime,omitnil,omitempty" name:"IsRefreshExpirationTime"`
-}
-
-func (r *DescribeExternalClusterSpecRequest) ToJsonString() string {
- b, _ := json.Marshal(r)
- return string(b)
-}
-
-// FromJsonString It is highly **NOT** recommended to use this function
-// because it has no param check, nor strict type check
-func (r *DescribeExternalClusterSpecRequest) FromJsonString(s string) error {
- f := make(map[string]interface{})
- if err := json.Unmarshal([]byte(s), &f); err != nil {
- return err
- }
- delete(f, "ClusterId")
- delete(f, "IsExtranet")
- delete(f, "IsRefreshExpirationTime")
- if len(f) > 0 {
- return tcerr.NewTencentCloudSDKError("ClientError.BuildRequestError", "DescribeExternalClusterSpecRequest has unknown keys!", "")
- }
- return json.Unmarshal([]byte(s), &r)
-}
-
-// Predefined struct for user
-type DescribeExternalClusterSpecResponseParams struct {
- // 导入第三方集群YAML定义
- Spec *string `json:"Spec,omitnil,omitempty" name:"Spec"`
-
- // agent.yaml文件过期时间字符串，时区UTC
- Expiration *string `json:"Expiration,omitnil,omitempty" name:"Expiration"`
-
- // 唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。
- RequestId *string `json:"RequestId,omitnil,omitempty" name:"RequestId"`
-}
-
-type DescribeExternalClusterSpecResponse struct {
- *tchttp.BaseResponse
- Response *DescribeExternalClusterSpecResponseParams `json:"Response"`
-}
-
-func (r *DescribeExternalClusterSpecResponse) ToJsonString() string {
- b, _ := json.Marshal(r)
- return string(b)
-}
-
-// FromJsonString It is highly **NOT** recommended to use this function
-// because it has no param check, nor strict type check
-func (r *DescribeExternalClusterSpecResponse) FromJsonString(s string) error {
- return json.Unmarshal([]byte(s), &r)
-}
-
// Predefined struct for user
type DescribeExternalNodeSupportConfigRequestParams struct {
// 集群Id
@@ -14628,6 +14625,16 @@ type ExtensionAddon struct {
AddonParam *string `json:"AddonParam,omitnil,omitempty" name:"AddonParam"`
}
+type FailedResource struct {
+ // 资源六段式
+ // 注意：此字段可能返回 null，表示取不到有效值。
+ Resource *string `json:"Resource,omitnil,omitempty" name:"Resource"`
+
+ // 执行失败的原因
+ // 注意：此字段可能返回 null，表示取不到有效值。
+ Error *string `json:"Error,omitnil,omitempty" name:"Error"`
+}
+
type Filter struct {
// 属性名称, 若存在多个Filter时，Filter间的关系为逻辑与（AND）关系。
Name *string `json:"Name,omitnil,omitempty" name:"Name"`
@@ -15972,7 +15979,7 @@ type LivenessOrReadinessProbe struct {
}
type LoginSettings struct {
- // 实例登录密码。不同操作系统类型密码复杂度限制不一样，具体如下：
Linux实例密码必须8到30位，至少包括两项[a-z]，[A-Z]、[0-9] 和 [( ) \` ~ ! @ # $ % ^ & * - + = | { } [ ] : ; ' , . ? / ]中的特殊符号。
Windows实例密码必须12到30位，至少包括三项[a-z]，[A-Z]，[0-9] 和 [( ) \` ~ ! @ # $ % ^ & * - + = | { } [ ] : ; ' , . ? /]中的特殊符号。
若不指定该参数，则由系统随机生成密码，并通过站内信方式通知到用户。
+ // 实例登录密码。不同操作系统类型密码复杂度限制不一样，具体如下：Linux实例密码必须8到30位，至少包括两项[a-z]，[A-Z]、[0-9] 和 [( ) \` ~ ! @ # $ % ^ & * - + = | { } [ ] : ; ' , . ? / ]中的特殊符号。Windows实例密码必须12到30位，至少包括三项[a-z]，[A-Z]，[0-9] 和 [( ) \` ~ ! @ # $ % ^ & * - + = | { } [ ] : ; ' , . ? /]中的特殊符号。若不指定该参数，则由系统随机生成密码，并通过站内信方式通知到用户。
// 注意：此字段可能返回 null，表示取不到有效值。
Password *string `json:"Password,omitnil,omitempty" name:"Password"`
@@ -15980,7 +15987,7 @@ type LoginSettings struct {
// 注意：此字段可能返回 null，表示取不到有效值。
KeyIds []*string `json:"KeyIds,omitnil,omitempty" name:"KeyIds"`
- // 保持镜像的原始设置。该参数与Password或KeyIds.N不能同时指定。只有使用自定义镜像、共享镜像或外部导入镜像创建实例时才能指定该参数为TRUE。取值范围：
TRUE：表示保持镜像的登录设置
FALSE：表示不保持镜像的登录设置
默认取值：FALSE。
+ // 保持镜像的原始设置。该参数与Password或KeyIds.N不能同时指定。只有使用自定义镜像、共享镜像或外部导入镜像创建实例时才能指定该参数为true。取值范围：true：表示保持镜像的登录设置false：表示不保持镜像的登录设置默认取值：false。
// 注意：此字段可能返回 null，表示取不到有效值。
KeepImageLogin *string `json:"KeepImageLogin,omitnil,omitempty" name:"KeepImageLogin"`
}
@@ -16650,6 +16657,78 @@ func (r *ModifyClusterRuntimeConfigResponse) FromJsonString(s string) error {
return json.Unmarshal([]byte(s), &r)
}
+// Predefined struct for user
+type ModifyClusterTagsRequestParams struct {
+ // 集群ID
+ ClusterId *string `json:"ClusterId,omitnil,omitempty" name:"ClusterId"`
+
+ // 集群标签
+ Tags []*Tag `json:"Tags,omitnil,omitempty" name:"Tags"`
+
+ // 是否同步集群内子资源标签
+ SyncSubresource *bool `json:"SyncSubresource,omitnil,omitempty" name:"SyncSubresource"`
+}
+
+type ModifyClusterTagsRequest struct {
+ *tchttp.BaseRequest
+
+ // 集群ID
+ ClusterId *string `json:"ClusterId,omitnil,omitempty" name:"ClusterId"`
+
+ // 集群标签
+ Tags []*Tag `json:"Tags,omitnil,omitempty" name:"Tags"`
+
+ // 是否同步集群内子资源标签
+ SyncSubresource *bool `json:"SyncSubresource,omitnil,omitempty" name:"SyncSubresource"`
+}
+
+func (r *ModifyClusterTagsRequest) ToJsonString() string {
+ b, _ := json.Marshal(r)
+ return string(b)
+}
+
+// FromJsonString It is highly **NOT** recommended to use this function
+// because it has no param check, nor strict type check
+func (r *ModifyClusterTagsRequest) FromJsonString(s string) error {
+ f := make(map[string]interface{})
+ if err := json.Unmarshal([]byte(s), &f); err != nil {
+ return err
+ }
+ delete(f, "ClusterId")
+ delete(f, "Tags")
+ delete(f, "SyncSubresource")
+ if len(f) > 0 {
+ return tcerr.NewTencentCloudSDKError("ClientError.BuildRequestError", "ModifyClusterTagsRequest has unknown keys!", "")
+ }
+ return json.Unmarshal([]byte(s), &r)
+}
+
+// Predefined struct for user
+type ModifyClusterTagsResponseParams struct {
+ // 集群标签
+ // 注意：此字段可能返回 null，表示取不到有效值。
+ Tags []*Tag `json:"Tags,omitnil,omitempty" name:"Tags"`
+
+ // 唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。
+ RequestId *string `json:"RequestId,omitnil,omitempty" name:"RequestId"`
+}
+
+type ModifyClusterTagsResponse struct {
+ *tchttp.BaseResponse
+ Response *ModifyClusterTagsResponseParams `json:"Response"`
+}
+
+func (r *ModifyClusterTagsResponse) ToJsonString() string {
+ b, _ := json.Marshal(r)
+ return string(b)
+}
+
+// FromJsonString It is highly **NOT** recommended to use this function
+// because it has no param check, nor strict type check
+func (r *ModifyClusterTagsResponse) FromJsonString(s string) error {
+ return json.Unmarshal([]byte(s), &r)
+}
+
// Predefined struct for user
type ModifyClusterVirtualNodePoolRequestParams struct {
// 集群ID
@@ -17758,7 +17837,7 @@ type OpenPolicyInfo struct {
// 注意：此字段可能返回 null，表示取不到有效值。
Name *string `json:"Name,omitnil,omitempty" name:"Name"`
- // 策略模版类型
+ // 策略模板类型
// 注意：此字段可能返回 null，表示取不到有效值。
Kind *string `json:"Kind,omitnil,omitempty" name:"Kind"`
@@ -17782,7 +17861,7 @@ type OpenPolicySwitch struct {
// 策略英文名称
Name *string `json:"Name,omitnil,omitempty" name:"Name"`
- // 策略模版类型
+ // 策略模板类型
Kind *string `json:"Kind,omitnil,omitempty" name:"Kind"`
// 策略开关状态：open打开，close关闭
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 49aec5c9f9..7fb926223a 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1163,7 +1163,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
## explicit; go 1.14
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
-# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1018
+# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1027
## explicit; go 1.11
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors
@@ -1321,7 +1321,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998
## explicit; go 1.14
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc/v20230321
-# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008
+# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1027
## explicit; go 1.14
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20220501