Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug: fix for eks cluster and nodepool tag issue #463

Merged
merged 2 commits into from
Dec 17, 2024
Merged

bug: fix for eks cluster and nodepool tag issue #463

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc567b7
Fix for eks cluster and nodepool tag issue
gusainsandhya Nov 19, 2024
d757312
Merge branch 'main' into eks_tag_fix
vivgoyal Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions internal/resources/ekscluster/resource_ekscluster.go
View file
Open in desktop
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
Loading