Skip to content

Commit a347588

Browse files
authored
fix(tke): [126253383] tencentcloud_kubernetes_node_pool support to modify user_data (#3461)
* add * add
1 parent 422876a commit a347588

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

.changelog/3461.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_kubernetes_node_pool: support to modify `user_data`.
3+
```

tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go

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

tencentcloud/services/tke/resource_tc_kubernetes_node_pool_extension.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,10 @@ func resourceTencentCloudKubernetesNodePoolReadPostHandleResponse1(ctx context.C
399399
nodeConfig["user_data"] = helper.PString(nodePool.UserScript)
400400
}
401401

402+
if helper.PString(nodePool.PreStartUserScript) != "" {
403+
nodeConfig["pre_start_user_script"] = helper.PString(nodePool.PreStartUserScript)
404+
}
405+
402406
if nodePool.GPUArgs != nil {
403407
setting := nodePool.GPUArgs
404408
var driverEmptyFlag, cudaEmptyFlag, cudnnEmptyFlag, customDriverEmptyFlag bool
@@ -834,13 +838,15 @@ func resourceTencentCloudKubernetesNodePoolUpdateOnExit(ctx context.Context) err
834838
_ = d.Set("auto_scaling_config.0.backup_instance_types", instanceTypes)
835839
}
836840

837-
if d.HasChange("node_config.0.pre_start_user_script") {
841+
if d.HasChange("node_config.0.user_data") || d.HasChange("node_config.0.pre_start_user_script") {
842+
userData := d.Get("node_config.0.user_data").(string)
838843
preStartUserScript := d.Get("node_config.0.pre_start_user_script").(string)
839844
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
840-
errRet := service.ModifyClusterNodePoolPreStartUserScript(ctx, clusterId, nodePoolId, preStartUserScript)
845+
errRet := service.ModifyClusterNodePoolPreStartUserScript(ctx, clusterId, nodePoolId, userData, preStartUserScript)
841846
if errRet != nil {
842847
return tccommon.RetryError(errRet)
843848
}
849+
844850
return nil
845851
})
846852

tencentcloud/services/tke/service_tencentcloud_tke.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1664,7 +1664,7 @@ func (me *TkeService) ModifyClusterNodePoolInstanceTypes(ctx context.Context, cl
16641664
return
16651665
}
16661666

1667-
func (me *TkeService) ModifyClusterNodePoolPreStartUserScript(ctx context.Context, clusterId, nodePoolId, preStartUserScript string) (errRet error) {
1667+
func (me *TkeService) ModifyClusterNodePoolPreStartUserScript(ctx context.Context, clusterId, nodePoolId, userData, preStartUserScript string) (errRet error) {
16681668
logId := tccommon.GetLogId(ctx)
16691669
request := tke.NewModifyClusterNodePoolRequest()
16701670

@@ -1675,6 +1675,7 @@ func (me *TkeService) ModifyClusterNodePoolPreStartUserScript(ctx context.Contex
16751675
}()
16761676
request.ClusterId = &clusterId
16771677
request.NodePoolId = &nodePoolId
1678+
request.UserScript = &userData
16781679
request.PreStartUserScript = &preStartUserScript
16791680

16801681
ratelimit.Check(request.GetAction())

website/docs/r/kubernetes_node_pool.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ The `node_config` object supports the following:
441441
* `is_schedule` - (Optional, Bool, ForceNew) Indicate to schedule the adding node or not. Default is true.
442442
* `mount_target` - (Optional, String, ForceNew) Mount target. Default is not mounting.
443443
* `pre_start_user_script` - (Optional, String) Base64-encoded user script, executed before initializing the node, currently only effective for adding existing nodes.
444-
* `user_data` - (Optional, String, ForceNew) Base64-encoded User Data text, the length limit is 16KB.
444+
* `user_data` - (Optional, String) Base64-encoded User Data text, the length limit is 16KB.
445445

446446
The `taints` object supports the following:
447447

0 commit comments

Comments
 (0)