Skip to content

Commit fc567b7

Browse files
gusainsandhyatenthirtyam
authored andcommitted
Fix for eks cluster and nodepool tag issue
Signed-off-by: Sandhya Gusain <sandhya.gusain@broadcom.com>
1 parent 37a6b65 commit fc567b7

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
@@ -706,15 +706,12 @@ func resourceClusterInPlaceUpdate(ctx context.Context, d *schema.ResourceData, m
706706
// EKS cluster update API on TMC side ignores nodepools passed to it.
707707
// The nodepools have to be updated via separate nodepool API, hence we
708708
// deal with them separately.
709-
errnp := handleNodepoolDiffs(config, opsRetryTimeout, getResp.EksCluster.FullName, nodepools)
710-
711709
errcl := handleClusterDiff(config, getResp.EksCluster, common.ConstructMeta(d), clusterSpec)
712710
if errcl != nil {
713711
return diag.FromErr(errors.Wrapf(errcl, "Unable to update Tanzu Mission Control EKS cluster entry, name : %s", d.Get(NameKey)))
714712
}
715713

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

0 commit comments

Comments
 (0)