Skip to content

Commit 9df21be

Browse files
authored
Fix/eks lb modify (#985)
* fix: eks lb change type error * fix: eks - lb modified problems
1 parent 26d2926 commit 9df21be

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

tencentcloud/resource_tc_eks_cluster.go

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,7 @@ func resourceTencentcloudEKSClusterUpdate(d *schema.ResourceData, meta interface
551551
enablePublic := false
552552
if d.HasChange("internal_lb") {
553553
updateAttrs = append(updateAttrs, "internal_lb")
554-
if v, ok := d.GetOk("internal_lb"); ok {
555-
lb := v.([]map[string]interface{})[0]
554+
if lb, ok := helper.InterfacesHeadMap(d, "internal_lb"); ok {
556555
enabled := lb["enabled"].(bool)
557556
request.InternalLB = &tke.ClusterInternalLB{
558557
Enabled: &enabled,
@@ -570,8 +569,7 @@ func resourceTencentcloudEKSClusterUpdate(d *schema.ResourceData, meta interface
570569

571570
if d.HasChange("public_lb") {
572571
updateAttrs = append(updateAttrs, "public_lb")
573-
if v, ok := d.GetOk("public_lb"); ok {
574-
lb := v.([]map[string]interface{})[0]
572+
if lb, ok := helper.InterfacesHeadMap(d, "public_lb"); ok {
575573
enabled := lb["enabled"].(bool)
576574
request.PublicLB = &tke.ClusterPublicLB{
577575
Enabled: &enabled,
@@ -591,8 +589,15 @@ func resourceTencentcloudEKSClusterUpdate(d *schema.ResourceData, meta interface
591589
Enabled: helper.Bool(false),
592590
}
593591
}
592+
}
594593

595-
err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
594+
if len(updateAttrs) > 0 {
595+
err := service.UpdateEksCluster(ctx, request)
596+
if err != nil {
597+
return err
598+
}
599+
600+
err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
596601
info, inErr := service.DescribeEKSClusterCredentialById(ctx, id)
597602
if inErr != nil {
598603
return retryError(inErr)
@@ -610,17 +615,6 @@ func resourceTencentcloudEKSClusterUpdate(d *schema.ResourceData, meta interface
610615
if err != nil {
611616
return err
612617
}
613-
614-
}
615-
616-
if len(updateAttrs) > 0 {
617-
err := service.UpdateEksCluster(ctx, request)
618-
if err != nil {
619-
return err
620-
}
621-
for _, attr := range updateAttrs {
622-
d.SetPartial(attr)
623-
}
624618
}
625619

626620
if d.HasChange("tags") {

tencentcloud/resource_tc_eks_cluster_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestAccTencentCloudEKSCluster_basic(t *testing.T) {
8282
resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.servers.#", "2"),
8383
resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.servers.0", "10.0.0.1:82"),
8484
resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "dns_servers.0.servers.1", "10.0.0.1:83"),
85-
resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "enable_vpc_core_dns", "false"),
85+
resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "enable_vpc_core_dns", "true"),
8686
resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "need_delete_cbs", "true"),
8787
resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "internal_lb.0.enabled", "true"),
8888
resource.TestCheckResourceAttr("tencentcloud_eks_cluster.foo", "public_lb.0.enabled", "true"),
@@ -217,7 +217,7 @@ resource "tencentcloud_eks_cluster" "foo" {
217217
domain = "example1.org"
218218
servers = ["10.0.0.1:82", "10.0.0.1:83"]
219219
}
220-
enable_vpc_core_dns = false
220+
enable_vpc_core_dns = true
221221
need_delete_cbs = true
222222
internal_lb {
223223
enabled = true

0 commit comments

Comments
 (0)