Skip to content

Conversation

@catlike
Copy link
Contributor

@catlike catlike commented Nov 25, 2025

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the library.

Changes to Security Controls

No changes to security controls

Description

This PR adds support for EKS Provisioned Control Plane feature.

The aws_eks_cluster resource and datasource have been updated to the support the new control_plane_scaling_config configuration block per the AWS Documentation

Documentation for both resource and datasource have been added as well.

Relations

Closes #45220

References

Amazon EKS Provisioned Control Plane
Getting started with the Amazon EKS Provisioned Control Plane
type ControlPlaneScalingConfig support was added to Terraform AWS Provider via #45227

Output from Acceptance Testing

aws_eks_cluster Resource Acceptance Testing

% make testacc TESTS=TestAccEKSCluster_basic PKG=eks
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_eks_cluster-provisioned-control-plane 🌿...
TF_ACC=1 go1.24.10 test ./internal/service/eks/... -v -count 1 -parallel 20 -run='TestAccEKSCluster_basic'  -timeout 360m -vet=off
2025/11/25 20:52:26 Creating Terraform AWS Provider (SDKv2-style)...
2025/11/25 20:52:26 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccEKSCluster_basic
=== PAUSE TestAccEKSCluster_basic
=== CONT  TestAccEKSCluster_basic
--- PASS: TestAccEKSCluster_basic (724.14s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/eks        724.262s
% make testacc TESTS=TestAccEKSCluster_controlPlaneScalingConfig PKG=eks
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_eks_cluster-provisioned-control-plane 🌿...
TF_ACC=1 go1.24.10 test ./internal/service/eks/... -v -count 1 -parallel 20 -run='TestAccEKSCluster_controlPlaneScalingConfig'  -timeout 360m -vet=off
2025/11/25 21:44:30 Creating Terraform AWS Provider (SDKv2-style)...
2025/11/25 21:44:30 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccEKSCluster_controlPlaneScalingConfig
=== PAUSE TestAccEKSCluster_controlPlaneScalingConfig
=== CONT  TestAccEKSCluster_controlPlaneScalingConfig
--- PASS: TestAccEKSCluster_controlPlaneScalingConfig (1600.76s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/eks        1600.883s

aws_eks_cluster Datasource Acceptance Testing

I did make a small change to TestAccEKSClusterDataSource_basic to get the resource.TestCheckResourceAttr checks passing for compute_config and storage_config in 66feb68 can revert that change if I have misunderstood the failure.

% make testacc TESTS=TestAccEKSClusterDataSource_basic PKG=eks
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_eks_cluster-provisioned-control-plane 🌿...
TF_ACC=1 go1.24.10 test ./internal/service/eks/... -v -count 1 -parallel 20 -run='TestAccEKSClusterDataSource_basic'  -timeout 360m -vet=off
2025/11/25 21:30:43 Creating Terraform AWS Provider (SDKv2-style)...
2025/11/25 21:30:43 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccEKSClusterDataSource_basic
=== PAUSE TestAccEKSClusterDataSource_basic
=== CONT  TestAccEKSClusterDataSource_basic
--- PASS: TestAccEKSClusterDataSource_basic (631.72s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/eks        631.837s
% make testacc TESTS=TestAccEKSClusterDataSource_controlPlaneScalingConfig PKG=eks
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_eks_cluster-provisioned-control-plane 🌿...
TF_ACC=1 go1.24.10 test ./internal/service/eks/... -v -count 1 -parallel 20 -run='TestAccEKSClusterDataSource_controlPlaneScalingConfig'  -timeout 360m -vet=off
2025/11/25 22:12:36 Creating Terraform AWS Provider (SDKv2-style)...
2025/11/25 22:12:36 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccEKSClusterDataSource_controlPlaneScalingConfig
=== PAUSE TestAccEKSClusterDataSource_controlPlaneScalingConfig
=== CONT  TestAccEKSClusterDataSource_controlPlaneScalingConfig
--- PASS: TestAccEKSClusterDataSource_controlPlaneScalingConfig (631.49s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/eks        631.624s

@catlike catlike requested a review from a team as a code owner November 25, 2025 22:58
@github-actions
Copy link
Contributor

Community Guidelines

This comment is added to every new Pull Request to provide quick reference to how the Terraform AWS Provider is maintained. Please review the information below, and thank you for contributing to the community that keeps the provider thriving! 🚀

Voting for Prioritization

  • Please vote on this Pull Request by adding a 👍 reaction to the original post to help the community and maintainers prioritize it.
  • Please see our prioritization guide for additional information on how the maintainers handle prioritization.
  • Please do not leave +1 or other comments that do not add relevant new information or questions; they generate extra noise for others following the Pull Request and do not help prioritize the request.

Pull Request Authors

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added needs-triage Waiting for first response or review from a maintainer. documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/eks Issues and PRs that pertain to the eks service. labels Nov 25, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Nov 25, 2025

✅ Thank you for correcting the previously detected issues! The maintainers appreciate your efforts to make the review process as smooth as possible.

@github-actions github-actions bot added size/L Managed by automation to categorize the size of a PR. partner Contribution from a partner. labels Nov 25, 2025
@ewbankkit ewbankkit added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Nov 26, 2025
@ewbankkit ewbankkit self-assigned this Nov 26, 2025
@github-actions github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Nov 26, 2025
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccEKSClusterDataSource_\|TestAccEKSCluster_basic\|TestAccEKSCluster_controlPlaneScalingConfig\|TestAccEKSCluster_Encryption_update' PKG=eks ACCTEST_PARALLELISM=4
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 HEAD 🌿...
TF_ACC=1 go1.24.10 test ./internal/service/eks/... -v -count 1 -parallel 4  -run=TestAccEKSClusterDataSource_\|TestAccEKSCluster_basic\|TestAccEKSCluster_controlPlaneScalingConfig\|TestAccEKSCluster_Encryption_update -timeout 360m -vet=off
2025/11/26 08:40:30 Creating Terraform AWS Provider (SDKv2-style)...
2025/11/26 08:40:30 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccEKSClusterDataSource_basic
=== PAUSE TestAccEKSClusterDataSource_basic
=== RUN   TestAccEKSClusterDataSource_outpost
=== PAUSE TestAccEKSClusterDataSource_outpost
=== RUN   TestAccEKSClusterDataSource_remoteNetwork
=== PAUSE TestAccEKSClusterDataSource_remoteNetwork
=== RUN   TestAccEKSClusterDataSource_controlPlaneScalingConfig
=== PAUSE TestAccEKSClusterDataSource_controlPlaneScalingConfig
=== RUN   TestAccEKSCluster_basic
=== PAUSE TestAccEKSCluster_basic
=== RUN   TestAccEKSCluster_controlPlaneScalingConfig
=== PAUSE TestAccEKSCluster_controlPlaneScalingConfig
=== RUN   TestAccEKSCluster_Encryption_update
=== PAUSE TestAccEKSCluster_Encryption_update
=== CONT  TestAccEKSClusterDataSource_basic
=== CONT  TestAccEKSCluster_basic
=== CONT  TestAccEKSCluster_Encryption_update
=== CONT  TestAccEKSCluster_controlPlaneScalingConfig
--- PASS: TestAccEKSClusterDataSource_basic (613.41s)
=== CONT  TestAccEKSClusterDataSource_remoteNetwork
--- PASS: TestAccEKSCluster_basic (650.33s)
=== CONT  TestAccEKSClusterDataSource_controlPlaneScalingConfig
--- PASS: TestAccEKSClusterDataSource_remoteNetwork (632.46s)
=== CONT  TestAccEKSClusterDataSource_outpost
    cluster_data_source_test.go:86: skipping since no Outposts found
--- SKIP: TestAccEKSClusterDataSource_outpost (0.71s)
--- PASS: TestAccEKSClusterDataSource_controlPlaneScalingConfig (606.62s)
--- PASS: TestAccEKSCluster_Encryption_update (1496.23s)
--- PASS: TestAccEKSCluster_controlPlaneScalingConfig (1502.12s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/eks	1508.075s

Copy link
Member

@johnsonaj johnsonaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@ewbankkit
Copy link
Contributor

@catlike Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 134c9aa into hashicorp:main Nov 26, 2025
46 checks passed
@github-actions
Copy link
Contributor

Warning

This Issue has been closed, meaning that any additional comments are much easier for the maintainers to miss. Please assume that the maintainers will not see them.

Ongoing conversations amongst community members are welcome, however, the issue will be locked after 30 days. Moving conversations to another venue, such as the AWS Provider forum, is recommended. If you have additional concerns, please open a new issue, referencing this one where needed.

@github-actions github-actions bot added this to the v6.23.0 milestone Nov 26, 2025
@github-actions
Copy link
Contributor

This functionality has been released in v6.23.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 github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Nov 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. partner Contribution from a partner. service/eks Issues and PRs that pertain to the eks service. size/L Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

EKS Provisioned Control Plane

3 participants