Skip to content

[WIP]fix(tke): [119316402] tencentcloud_kubernetes_node_pool support delete taints and labels params #2827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[WIP]fix(tke): [119316402] tencentcloud_kubernetes_node_pool support delete taints and labels params #2827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ef5c09
add
SevenEarth Sep 13, 2024
c0f0e50
add
SevenEarth Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/2827.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_kubernetes_node_pool: support delete `taints` and `labels` params
```
90 changes: 72 additions & 18 deletions tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

97 changes: 73 additions & 24 deletions tencentcloud/services/tke/resource_tc_kubernetes_node_pool_extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"log"
"strings"

tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http"

as "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as/v20180419"
sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"

Expand Down Expand Up @@ -616,48 +618,94 @@ func resourceTencentCloudKubernetesNodePoolUpdateOnStart(ctx context.Context) er
"labels",
"tags",
) {
request := tke.NewModifyClusterNodePoolRequest()
request.ClusterId = &clusterId
request.NodePoolId = &nodePoolId
var body map[string]interface{}
nodeOs := d.Get("node_os").(string)
nodeOsType := d.Get("node_os_type").(string)
//自定镜像不能指定节点操作系统类型
if strings.Contains(nodeOs, "img-") {
nodeOsType = ""
}

labels := GetTkeLabels(d, "labels")
tags := helper.GetTags(d, "tags")
if len(labels) > 0 {
request.Labels = labels
body = map[string]interface{}{
"ClusterId": clusterId,
"NodePoolId": nodePoolId,
"OsName": nodeOs,
"OsCustomizeType": nodeOsType,
"Labels": labels,
}

tags := helper.GetTags(d, "tags")
if len(tags) > 0 {
var tmpTags []*tke.Tag
for k, v := range tags {
key := k
val := v
request.Tags = append(request.Tags, &tke.Tag{
tmpTags = append(tmpTags, &tke.Tag{
Key: &key,
Value: &val,
})
}

body["Tags"] = tmpTags
}

nodeOs := d.Get("node_os").(string)
nodeOsType := d.Get("node_os_type").(string)
//自定镜像不能指定节点操作系统类型
if strings.Contains(nodeOs, "img-") {
nodeOsType = ""
client := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseOmitNilClient("tke")
request := tchttp.NewCommonRequest("tke", "2018-05-25", "ModifyClusterNodePool")
err := request.SetActionParameters(body)
if err != nil {
return err
}
request.OsName = &nodeOs
request.OsCustomizeType = &nodeOsType
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterNodePool(request)
if e != nil {
return tccommon.RetryError(e)
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
}
return nil
})

response := tchttp.NewCommonResponse()
err = client.Send(request, response)
if err != nil {
log.Printf("[CRITAL]%s update kubernetes node pool failed, reason:%+v", logId, err)
fmt.Printf("update kubernetes node pool taints failed: %v \n", err)
return err
}

//request := tke.NewModifyClusterNodePoolRequest()
//request.ClusterId = &clusterId
//request.NodePoolId = &nodePoolId
//nodeOs := d.Get("node_os").(string)
//nodeOsType := d.Get("node_os_type").(string)
////自定镜像不能指定节点操作系统类型
//if strings.Contains(nodeOs, "img-") {
// nodeOsType = ""
//}
//request.OsName = &nodeOs
//request.OsCustomizeType = &nodeOsType
//
//labels := GetTkeLabels(d, "labels")
//tags := helper.GetTags(d, "tags")
//if len(labels) > 0 {
// request.Labels = labels
//}
//if len(tags) > 0 {
// for k, v := range tags {
// key := k
// val := v
// request.Tags = append(request.Tags, &tke.Tag{
// Key: &key,
// Value: &val,
// })
// }
//}
//
//err = resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
// result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterNodePool(request)
// if e != nil {
// return tccommon.RetryError(e)
// } else {
// log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
// }
// return nil
//})
//if err != nil {
// log.Printf("[CRITAL]%s update kubernetes node pool failed, reason:%+v", logId, err)
// return err
//}

// todo wait for status ok
err = resource.Retry(5*tccommon.ReadRetryTimeout, func() *resource.RetryError {
nodePool, _, errRet := service.DescribeNodePool(ctx, clusterId, nodePoolId)
Expand All @@ -669,6 +717,7 @@ func resourceTencentCloudKubernetesNodePoolUpdateOnStart(ctx context.Context) er
}
return resource.RetryableError(fmt.Errorf("node pool status is %s, retry...", *nodePool.LifeState))
})

if err != nil {
return err
}
Expand Down
Loading