Skip to content

Commit 042fde1

Browse files
bug: fix for eks cluster and nodepool tag issue (#463)
Fix for eks cluster and nodepool tag issue Signed-off-by: Sandhya Gusain <sandhya.gusain@broadcom.com>
1 parent 5f9eb82 commit 042fde1

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

internal/resources/ekscluster/resource_ekscluster.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -705,15 +705,12 @@ func resourceClusterInPlaceUpdate(ctx context.Context, d *schema.ResourceData, m
705705
// EKS cluster update API on TMC side ignores nodepools passed to it.
706706
// The nodepools have to be updated via separate nodepool API, hence we
707707
// deal with them separately.
708-
errnp := handleNodepoolDiffs(config, opsRetryTimeout, getResp.EksCluster.FullName, nodepools)
709-
710708
errcl := handleClusterDiff(config, getResp.EksCluster, common.ConstructMeta(d), clusterSpec)
711709
if errcl != nil {
712710
return diag.FromErr(errors.Wrapf(errcl, "Unable to update Tanzu Mission Control EKS cluster entry, name : %s", d.Get(NameKey)))
713711
}
714712

715-
// this is moved here so as to not bail on the cluster update
716-
// when there is a nodepool update error
713+
errnp := handleNodepoolDiffs(config, opsRetryTimeout, getResp.EksCluster.FullName, nodepools)
717714
if errnp != nil {
718715
return diag.FromErr(errors.Wrapf(errnp, "Unable to update Tanzu Mission Control EKS cluster's nodepools, name : %s", d.Get(NameKey)))
719716
}

0 commit comments

Comments
 (0)