Skip to content

✨ Add node auto repair configuration for EKS managed node groups #5604

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

Jump to bottom
Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

✨ Add node auto repair configuration for EKS managed node groups #5604

wants to merge 1 commit into from
+152 −0

Conversation

afarbos
Copy link
Contributor

@afarbos afarbos commented Jul 31, 2025 •
edited
Loading

What type of PR is this?

/kind feature

What this PR does / why we need it:

This PR adds support for node auto repair configuration in EKS managed node groups. Node auto repair is a feature that allows EKS to automatically repair unhealthy nodes by replacing them, helping maintain cluster health and availability.

https://aws.amazon.com/about-aws/whats-new/2024/12/node-health-monitoring-auto-repair-amazon-eks/

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 #

Special notes for your reviewer:

  • API Types: Added NodeRepairConfig field to AWSManagedMachinePoolSpec with an enabled boolean field
  • EKS Service: Integrated node repair configuration into node group creation and update logic
  • Converters: Added NodegroupRepairConfigToSDK and NodegroupRepairConfigFromSDK functions
  • Tests: Added comprehensive unit tests for the new converter functions

Checklist:

  • squashed commits
  • includes documentation
  • includes emoji in title
  • adds unit tests
  • adds or updates e2e tests

Release note:

Added support for configuring node auto repair functionality in EKS managed node groups

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 31, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @afarbos. 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.

@afarbos afarbos force-pushed the af/EKSNodeRepair branch 4 times, most recently from c29aa17 to 308295b Compare July 31, 2025 17:46
@k8s-ci-robot 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 Jul 31, 2025
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 30, 2025
serngawy
serngawy reviewed Oct 1, 2025
View reviewed changes
exp/api/v1beta2/awsmanagedmachinepool_types.go
}

// NodeRepairConfig defines the node auto repair configuration for managed node groups.
type NodeRepairConfig struct {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a chance to extend this struct (adding more fields) ? if not, then adding autoNodeRepair boolean field under spec is better

Copy link
Contributor Author

@afarbos afarbos Oct 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

There is are more fields, see https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/service/[email protected]/types#NodeRepairConfig / https://docs.aws.amazon.com/eks/latest/APIReference/API_NodeRepairConfig.html Do you want me to add support for all?
Note: those did not exist when this PR was created

Copy link
Contributor

Choose a reason for hiding this comment

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

Fine as a struct, given that more options may be supported in the future. Is enabled enough as default to get the feature to work nicely? If yes, I think we can live with only the enabled field for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, those field did not exist in 1.73.0 version/until recently. This is why i did not include them from the start see https://pkg.go.dev/github.com/aws/aws-sdk-go-v2/service/[email protected]/types#NodeRepairConfig

Also the API linked above does not mention any being required, see the Required: No

@serngawy
Copy link
Contributor

serngawy commented Oct 1, 2025

@afarbos rebase is required for the PR

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 6, 2025
@afarbos
Copy link
Contributor Author

afarbos commented Oct 6, 2025

@afarbos rebase is required for the PR

rebased

@afarbos afarbos requested a review from serngawy October 6, 2025 16:55
AndiDog
AndiDog reviewed Oct 7, 2025
View reviewed changes
exp/api/v1beta2/awsmanagedmachinepool_types.go
}

// NodeRepairConfig defines the node auto repair configuration for managed node groups.
type NodeRepairConfig struct {
Copy link
Contributor

Choose a reason for hiding this comment

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

Fine as a struct, given that more options may be supported in the future. Is enabled enough as default to get the feature to work nicely? If yes, I think we can live with only the enabled field for now.

@AndiDog AndiDog self-assigned this Oct 7, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from andidog. For more information see the Code Review Process.

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

Needs approval from an approver in each of these files:

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

@afarbos afarbos requested a review from AndiDog October 7, 2025 22:19
@afarbos
Copy link
Contributor Author

afarbos commented Oct 7, 2025

I also tried to add a e2e test here after I saw them. I am not sure how to run them here.

@AndiDog
Copy link
Contributor

AndiDog commented Oct 13, 2025

/ok-to-test
/test pull-cluster-api-provider-aws-e2e-eks
/lgtm

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Oct 13, 2025
@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 13, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: e9654264f42f3d4950b4533ce50f01074db3c139

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 13, 2025
@afarbos
Copy link
Contributor Author

afarbos commented Oct 13, 2025

/retest

@afarbos
Copy link
Contributor Author

afarbos commented Oct 13, 2025

/retest

1 similar comment
@afarbos
Copy link
Contributor Author

afarbos commented Oct 14, 2025

/retest

@AndiDog
Copy link
Contributor

AndiDog commented Oct 16, 2025

/lgtm

On to @kubernetes-sigs/cluster-api-provider-aws-maintainers for a second pair of eyes and approval

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 16, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: e5dbb561cff2dffb3e1dafcb598d58a9fe81d02e

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dlipovetsky dlipovetsky Awaiting requested review from dlipovetsky

@serngawy serngawy Awaiting requested review from serngawy

@AndiDog AndiDog Awaiting requested review from AndiDog

Assignees

@AndiDog AndiDog

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@afarbos @k8s-ci-robot @serngawy @AndiDog