EKS Add-on resolve_conflicts with PRESERVE feature tests and docs updated

[vara-bonthu]

Description

EKS API now provides three options for resolve_conflicts which are NONE, OVERWRITE and PRESERVE.

EKS Add-on currently supports a new feature to preserve user configuration during the upgrade of EKS Add-ons. Any changes applied to the managed add-ons using kubectl or through any other approach will be retained during the upgrade of managed add-on to the newer version.

Current behaviour of the upgrade add-on version overwrites the custom changes applied to the previous version of add-on However, users can retain the custom configuration during the add-on upgrades by using resolve_conflicts = "PRESERVE"

This new resolve_conflicts with PRESERVE feature is already supported by the current version(4.32.0) of AWS provider since the option of pulling resolve_conflicts string is dynamic using eks.ResolveConflicts_Values hence the users can now pass the resolve_conflicts = "PRESERVE" during the upgrade of the add-on.

I have added the tests and updates to the dcoumentation

Relations

References

Output from Acceptance Testing

➜  terraform-provider-aws git:(f-eks_addon-refactor) ✗ make testacc TESTARGS='-run=TestAccEKSAddon_resolveConflicts' PKG=eks TIMEOUT=300m
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/eks/... -v -count 1 -parallel 20  -run=TestAccEKSAddon_resolveConflicts -timeout 180m
=== RUN   TestAccEKSAddon_resolveConflicts
=== PAUSE TestAccEKSAddon_resolveConflicts
=== CONT  TestAccEKSAddon_resolveConflicts
--- PASS: TestAccEKSAddon_resolveConflicts (741.34s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/eks        760.820s

——

[github-actions]

Community Note

Voting for Prioritization

• Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
• Please see our prioritization guide for information on how we prioritize.
• Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

• Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
• For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
• Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

[ewbankkit]

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccEKSAddon_resolveConflicts' PKG=eks 
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/eks/... -v -count 1 -parallel 20  -run=TestAccEKSAddon_resolveConflicts -timeout 180m
=== RUN   TestAccEKSAddon_resolveConflicts
=== PAUSE TestAccEKSAddon_resolveConflicts
=== CONT  TestAccEKSAddon_resolveConflicts
--- PASS: TestAccEKSAddon_resolveConflicts (794.21s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/eks	798.350s

[ewbankkit]

@vara-bonthu Thanks for the contribution 🎉 👏.

[github-actions]

This functionality has been released in v4.34.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

[github-actions]

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.