Skip to content

Commit 98cfc23

Browse files
authored
feat(tke): [119825645]adjust the msg and adjust init of InstanceAdvancedSettings (#2839)
* feat(tke): [119825645]adjust the msg * add changelog * adjust init of req.InstanceAdvancedSettings.Labels
1 parent e7a350e commit 98cfc23

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.changelog/2839.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
datasource/tencentcloud_kubernetes_scale_worker: adjust the message when creating instances all failed
3+
```

tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment_extension.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ func resourceTencentCloudKubernetesClusterAttachmentCreatePostFillRequest0(ctx c
4545
req.InstanceAdvancedSettings = &tke.InstanceAdvancedSettings{}
4646
}
4747
// labels
48-
req.InstanceAdvancedSettings = &tke.InstanceAdvancedSettings{}
4948
req.InstanceAdvancedSettings.Labels = GetTkeLabels(d, "labels")
5049

5150
if dMap, ok := helper.InterfacesHeadMap(d, "worker_config"); ok {

tencentcloud/services/tke/resource_tc_kubernetes_scale_worker_extension.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ func resourceTencentCloudKubernetesScaleWorkerCreateOnStart(ctx context.Context)
483483
if stop == len(instanceIds) && flag {
484484
return nil
485485
} else if stop == len(instanceIds) && !flag {
486-
return resource.NonRetryableError(fmt.Errorf("cluster all instances state is failed"))
486+
return resource.NonRetryableError(fmt.Errorf("The instances being created have all failed."))
487487
} else {
488488
e = fmt.Errorf("cluster instances is still initializing.")
489489
return resource.RetryableError(e)

0 commit comments

Comments
 (0)