✨ Migrate EKS packages to AWS SDK v2 #5498

punkwalker · 2025-05-19T22:37:43Z

What type of PR is this?

/kind feature
/kind cleanup

What this PR does / why we need it:

Migrates EKS package to AWS SDK V2.
Removes WithCredentialsChainVerboseErrors from V2 sessions of e2e tests as support for it was removed in V2: What happened to CredentialsChainVerboseErrors? aws/aws-sdk-go-v2#98
Adds max-wait-managed-resources flag to specify maximum duration to wait for AWS managed resources to be ready. Currently it is respected by AWSManagedControlPlane, AWSManagedMachinePool and EKSAddons.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #5404
Special notes for your reviewer:
Part of AWS SDK V2 migration. Ref: #2225

Checklist:

Release note:

Migrate EKS packages to AWS SDK v2

k8s-ci-robot · 2025-05-19T22:37:53Z

Hi @punkwalker. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

damdo · 2025-05-21T19:37:27Z

/ok-to-test

punkwalker · 2025-05-21T23:40:10Z

/test pull-cluster-api-provider-aws-test
/test pull-cluster-api-provider-aws-e2e-eks

test/e2e/shared/suite.go

pkg/cloud/converters/eks.go

punkwalker · 2025-05-23T00:38:47Z

/test pull-cluster-api-provider-aws-e2e-eks

punkwalker · 2025-05-23T18:26:24Z

/test pull-cluster-api-provider-aws-e2e-eks

punkwalker · 2025-05-23T18:29:55Z

/retest

cmd/clusterawsadm/cmd/eks/addons/list_available.go

pkg/cloud/services/eks/addons.go

richardcase · 2025-05-27T09:03:34Z

pkg/cloud/services/eks/eks.go


+const (
+	// Maximum duration for waiting on EKS cluster state.
+	maxActiveUpdateDeleteWait = 15 * time.Minute


Should we make this configurable?

@richardcase Sure. Do you have any opinion on where this should be configurable? As a flag or a field in the AWSManagedControlPlane type?
I feel it should be a field in the type, same way we can have a field for AWSManagedMachinePool.

I would've said flag :) Depends if we want it global or set per cluster. I can't imagine we'd want to change it per cluster....but i could be wrong?

We can go with flag, as the value really doesn't matter in happy case. So I will make it a flag which can be used with ControlPlane, MachinePool and Addon alike with 30mins default value. What do you think?

Added the flag. Please check @richardcase

punkwalker · 2025-05-27T19:02:42Z

/test pull-cluster-api-provider-aws-e2e-eks

Signed-off-by: Pankaj Walke <[email protected]>

…EKS resource creation to be ready Signed-off-by: Pankaj Walke <[email protected]>

Signed-off-by: Pankaj Walke <[email protected]>

punkwalker · 2025-06-02T21:45:03Z

/test pull-cluster-api-provider-aws-e2e-eks

alexander-demicev · 2025-06-03T08:41:16Z

/lgtm

k8s-ci-robot · 2025-06-03T08:41:23Z

LGTM label has been added.

Git tree hash: 9ca18d0d176eedc769754960aa1f1ca57a390700

nrb · 2025-06-03T19:08:56Z

/approve

k8s-ci-robot · 2025-06-03T19:09:05Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nrb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [nrb]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot requested review from luthermonson and richardcase May 19, 2025 22:37

k8s-ci-robot added the needs-priority label May 19, 2025

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 19, 2025

damdo mentioned this pull request May 21, 2025

Migrate eks code to AWS SDK v2 #5404

Closed

damdo linked an issue May 21, 2025 that may be closed by this pull request

Migrate eks code to AWS SDK v2 #5404

Closed

punkwalker changed the title ~~WIP: ✨ Migrate EKS packages to AWS SDK v2~~ ✨ Migrate EKS packages to AWS SDK v2 May 21, 2025

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 21, 2025

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 21, 2025

punkwalker force-pushed the eks-aws-sdk-v2-migration branch 2 times, most recently from 2c09599 to 7db7dd1 Compare May 21, 2025 22:31

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 21, 2025

seanschneeweiss reviewed May 22, 2025

View reviewed changes

test/e2e/shared/suite.go Outdated Show resolved Hide resolved

pkg/cloud/converters/eks.go Outdated Show resolved Hide resolved

punkwalker force-pushed the eks-aws-sdk-v2-migration branch from 848c7c5 to d6de30f Compare May 23, 2025 00:26

seanschneeweiss mentioned this pull request May 24, 2025

Add EKS AutoMode support #5278

Open

richardcase reviewed May 27, 2025

View reviewed changes

punkwalker requested review from richardcase and seanschneeweiss May 28, 2025 15:59

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 2, 2025

punkwalker added 8 commits June 2, 2025 20:37

migrate EKS client to AWS SDK V2

abacc75

Signed-off-by: Pankaj Walke <[email protected]>

migrate EKS client from e2e to AWS SDK V2

b6d7cf6

Signed-off-by: Pankaj Walke <[email protected]>

fix lint errors

3ae8a18

Signed-off-by: Pankaj Walke <[email protected]>

migrate EKS package for clusterawsadm

ad7a804

Signed-off-by: Pankaj Walke <[email protected]>

fix e2e tests

d9689da

Signed-off-by: Pankaj Walke <[email protected]>

address review comments

b9e5cc0

Signed-off-by: Pankaj Walke <[email protected]>

fix final custom AMI e2e test

715851c

Signed-off-by: Pankaj Walke <[email protected]>

add flag maxWaitActiveUpdateDelete for configurable wait for managed …

8e113d9

…EKS resource creation to be ready Signed-off-by: Pankaj Walke <[email protected]>

punkwalker force-pushed the eks-aws-sdk-v2-migration branch from a960b88 to 8e113d9 Compare June 2, 2025 20:51

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 2, 2025

fix merge issues

9ecc240

Signed-off-by: Pankaj Walke <[email protected]>

punkwalker force-pushed the eks-aws-sdk-v2-migration branch from 6156782 to 9ecc240 Compare June 2, 2025 21:33

k8s-ci-robot assigned alexander-demicev Jun 3, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 3, 2025

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 3, 2025

k8s-ci-robot merged commit f5dca4c into kubernetes-sigs:main Jun 3, 2025
18 checks passed

k8s-ci-robot added this to the v2.8 milestone Jun 3, 2025

punkwalker mentioned this pull request Jun 4, 2025

Support EKS Hybrid Nodes #5245

Open

punkwalker mentioned this pull request Jun 12, 2025

✨ Migrate ssm code to AWS SDK v2 #5529

Merged

damdo mentioned this pull request Jun 17, 2025

🐛 fix: missing MaxActiveUpdateDeleteWait in managednodegroup scope #5554

Merged

✨ Migrate EKS packages to AWS SDK v2 #5498

✨ Migrate EKS packages to AWS SDK v2 #5498

Uh oh!

Conversation

punkwalker commented May 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented May 19, 2025

Uh oh!

damdo commented May 21, 2025

Uh oh!

punkwalker commented May 21, 2025

Uh oh!

Uh oh!

Uh oh!

punkwalker commented May 23, 2025

Uh oh!

punkwalker commented May 23, 2025

Uh oh!

punkwalker commented May 23, 2025

Uh oh!

Uh oh!

Uh oh!

richardcase May 27, 2025

Choose a reason for hiding this comment

Uh oh!

punkwalker May 27, 2025

Choose a reason for hiding this comment

Uh oh!

richardcase May 27, 2025

Choose a reason for hiding this comment

Uh oh!

punkwalker May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

punkwalker May 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

punkwalker commented May 27, 2025

Uh oh!

punkwalker commented Jun 2, 2025

Uh oh!

alexander-demicev commented Jun 3, 2025

Uh oh!

k8s-ci-robot commented Jun 3, 2025

Uh oh!

nrb commented Jun 3, 2025

Uh oh!

k8s-ci-robot commented Jun 3, 2025

Uh oh!

Uh oh!

Uh oh!

punkwalker commented May 19, 2025 •

edited

Loading

punkwalker May 27, 2025 •

edited

Loading

punkwalker May 27, 2025 •

edited

Loading