Skip to content

Commit

Permalink
bug: fix for eks cluster and nodepool tag issue (#463)
Browse files Browse the repository at this point in the history
Fix for eks cluster and nodepool tag issue
Signed-off-by: Sandhya Gusain <[email protected]>
  • Loading branch information
gusainsandhya authored Dec 17, 2024
1 parent 5f9eb82 commit 042fde1
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions internal/resources/ekscluster/resource_ekscluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -705,15 +705,12 @@ func resourceClusterInPlaceUpdate(ctx context.Context, d *schema.ResourceData, m
// EKS cluster update API on TMC side ignores nodepools passed to it.
// The nodepools have to be updated via separate nodepool API, hence we
// deal with them separately.
errnp := handleNodepoolDiffs(config, opsRetryTimeout, getResp.EksCluster.FullName, nodepools)

errcl := handleClusterDiff(config, getResp.EksCluster, common.ConstructMeta(d), clusterSpec)
if errcl != nil {
return diag.FromErr(errors.Wrapf(errcl, "Unable to update Tanzu Mission Control EKS cluster entry, name : %s", d.Get(NameKey)))
}

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

0 comments on commit 042fde1

Please sign in to comment.