From f9d7888346e61d76de637bdca4ef10ff26b6232f Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Mon, 21 Oct 2024 15:12:04 +0800 Subject: [PATCH 1/3] feat(tke): [120225585] adjust native node pool labels sequence to set --- .../services/tke/resource_tc_kubernetes_native_node_pool.go | 6 +++--- website/docs/r/kubernetes_native_node_pool.html.markdown | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_native_node_pool.go b/tencentcloud/services/tke/resource_tc_kubernetes_native_node_pool.go index 9afc08d2ae..4f9470da33 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_native_node_pool.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_native_node_pool.go @@ -48,7 +48,7 @@ func ResourceTencentCloudKubernetesNativeNodePool() *schema.Resource { }, "labels": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Description: "Node Labels.", Elem: &schema.Resource{ @@ -615,7 +615,7 @@ func resourceTencentCloudKubernetesNativeNodePoolCreate(d *schema.ResourceData, } if v, ok := d.GetOk("labels"); ok { - for _, item := range v.([]interface{}) { + for _, item := range v.(*schema.Set).List() { labelsMap := item.(map[string]interface{}) label := tke2.Label{} if v, ok := labelsMap["name"]; ok { @@ -1423,7 +1423,7 @@ func resourceTencentCloudKubernetesNativeNodePoolUpdate(d *schema.ResourceData, } if v, ok := d.GetOk("labels"); ok { - for _, item := range v.([]interface{}) { + for _, item := range v.(*schema.Set).List() { labelsMap := item.(map[string]interface{}) label := tke2.Label{} if v, ok := labelsMap["name"]; ok { diff --git a/website/docs/r/kubernetes_native_node_pool.html.markdown b/website/docs/r/kubernetes_native_node_pool.html.markdown index 180c1bf5de..24e4fe8354 100644 --- a/website/docs/r/kubernetes_native_node_pool.html.markdown +++ b/website/docs/r/kubernetes_native_node_pool.html.markdown @@ -113,7 +113,7 @@ The following arguments are supported: * `type` - (Required, String) Node pool type. Optional value is `Native`. * `annotations` - (Optional, Set) Node Annotation List. * `deletion_protection` - (Optional, Bool) Whether to enable deletion protection. -* `labels` - (Optional, List) Node Labels. +* `labels` - (Optional, Set) Node Labels. * `tags` - (Optional, List) Node tags. * `taints` - (Optional, List) Node taint. * `unschedulable` - (Optional, Bool) Whether the node is not schedulable by default. The native node is not aware of it and passes false by default. From 3bb7e17b317d30f168613dee86d99c8972d850e0 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Mon, 21 Oct 2024 15:15:11 +0800 Subject: [PATCH 2/3] add changelog --- .changelog/2900.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2900.txt diff --git a/.changelog/2900.txt b/.changelog/2900.txt new file mode 100644 index 0000000000..93b98caef4 --- /dev/null +++ b/.changelog/2900.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/kubernetes_native_node_pool: adjust the `labels` field to Set type +``` \ No newline at end of file From 435d317a8a38261be4a5b68bff6c576b2d651805 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Mon, 21 Oct 2024 16:09:27 +0800 Subject: [PATCH 3/3] increase the timeout of the read retry --- .changelog/2900.txt | 4 ++++ .../services/tke/resource_tc_kubernetes_auth_attachment.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.changelog/2900.txt b/.changelog/2900.txt index 93b98caef4..c39c2bc99c 100644 --- a/.changelog/2900.txt +++ b/.changelog/2900.txt @@ -1,3 +1,7 @@ ```release-note:enhancement resource/kubernetes_native_node_pool: adjust the `labels` field to Set type +``` + +```release-note:enhancement +resource/tencentcloud_kubernetes_auth_attachment: increase the timeout of the read retry ``` \ No newline at end of file diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment.go b/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment.go index cbcb519298..8a89a0c8f7 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment.go @@ -196,7 +196,7 @@ func resourceTencentCloudKubernetesAuthAttachmentRead(d *schema.ResourceData, me _ = d.Set("cluster_id", clusterId) var respData *tkev20180525.DescribeClusterAuthenticationOptionsResponseParams - reqErr := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { + reqErr := resource.Retry(3*tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesAuthAttachmentById(ctx, clusterId) if e != nil { return tccommon.RetryError(e)