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

afarbos · 2025-07-31T17:25:52Z

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:

Release note:

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

k8s-ci-robot · 2025-07-31T17:26:02Z

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.

k8s-ci-robot · 2025-07-31T17:26:11Z

[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 assign dlipovetsky for approval. 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:

OWNERS

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

serngawy · 2025-10-01T14:20:12Z

exp/api/v1beta2/awsmanagedmachinepool_types.go

 }

+// NodeRepairConfig defines the node auto repair configuration for managed node groups.
+type NodeRepairConfig struct {


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

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

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.

serngawy · 2025-10-01T14:21:33Z

@afarbos rebase is required for the PR

afarbos · 2025-10-06T16:52:18Z

@afarbos rebase is required for the PR

rebased

AndiDog · 2025-10-07T05:07:27Z

exp/api/v1beta2/awsmanagedmachinepool_types.go

 }

+// NodeRepairConfig defines the node auto repair configuration for managed node groups.
+type NodeRepairConfig struct {


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 · 2025-10-07T05:08:29Z

pkg/cloud/converters/eks.go

+// NodegroupRepairConfigToSDK is used to convert a CAPA NodeRepairConfig to AWS SDK NodeRepairConfig.
+func NodegroupRepairConfigToSDK(repairConfig *expinfrav1.NodeRepairConfig) *ekstypes.NodeRepairConfig {


Suggested change

// NodegroupRepairConfigToSDK is used to convert a CAPA NodeRepairConfig to AWS SDK NodeRepairConfig.

func NodegroupRepairConfigToSDK(repairConfig *expinfrav1.NodeRepairConfig) *ekstypes.NodeRepairConfig {

// NodeRepairConfigToSDK is used to convert a CAPA NodeRepairConfig to AWS SDK NodeRepairConfig.

func NodeRepairConfigToSDK(repairConfig *expinfrav1.NodeRepairConfig) *ekstypes.NodeRepairConfig {

AndiDog · 2025-10-07T05:09:22Z

pkg/cloud/converters/eks_test.go

+	expinfrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/exp/api/v1beta2"
+)
+
+func TestNodegroupRepairConfigToSDK(t *testing.T) {


Suggested change

func TestNodegroupRepairConfigToSDK(t *testing.T) {

func TestNodeRepairConfigToSDK(t *testing.T) {

AndiDog · 2025-10-07T05:11:34Z

pkg/cloud/converters/eks_test.go

+				return
+			}
+			if result == nil || tt.expected == nil {
+				t.Errorf("NodegroupRepairConfigToSDK() = %v, want %v", result, tt.expected)


Suggested change

t.Errorf("NodegroupRepairConfigToSDK() = %v, want %v", result, tt.expected)

t.Errorf("NodeRepairConfigToSDK() = %v, want %v", result, tt.expected)

[repeated]

AndiDog · 2025-10-07T05:12:17Z

pkg/cloud/converters/eks_test.go

+			if result == nil && tt.expected == nil {
+				return
+			}
+			if result == nil || tt.expected == nil {


Suggested change

if result == nil && tt.expected == nil {

return

}

if result == nil || tt.expected == nil {

if result == nil {

...as the function shouldn't return nil

AndiDog · 2025-10-07T05:14:59Z

pkg/cloud/converters/eks_test.go

+				t.Errorf("NodegroupRepairConfigToSDK() = %v, want %v", result, tt.expected)
+				return
+			}
+			if *result.Enabled != *tt.expected.Enabled {


Can we instead use reflect.DeepEqual or something else that diffs the whole struct at once? That will be easier once new fields become supported in CAPA.

k8s-ci-robot requested review from dlipovetsky and serngawy July 31, 2025 17:26

afarbos force-pushed the af/EKSNodeRepair branch 4 times, most recently from c29aa17 to 308295b Compare July 31, 2025 17:46

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 added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 30, 2025

serngawy reviewed Oct 1, 2025

View reviewed changes

feat: add node auto repair configuration for EKS managed node groups

28ad4be

afarbos force-pushed the af/EKSNodeRepair branch from 308295b to 28ad4be Compare October 6, 2025 16:52

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 requested a review from serngawy October 6, 2025 16:55

AndiDog reviewed Oct 7, 2025

View reviewed changes

AndiDog self-assigned this Oct 7, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

afarbos commented Jul 31, 2025 •

edited

Loading

Uh oh!

k8s-ci-robot commented Jul 31, 2025

Uh oh!

k8s-ci-robot commented Jul 31, 2025

Uh oh!

serngawy Oct 1, 2025

Uh oh!

afarbos Oct 6, 2025 •

edited

Loading

Uh oh!

AndiDog Oct 7, 2025

Uh oh!

serngawy commented Oct 1, 2025

Uh oh!

afarbos commented Oct 6, 2025

Uh oh!

AndiDog Oct 7, 2025

Uh oh!

AndiDog Oct 7, 2025

Uh oh!

AndiDog Oct 7, 2025

Uh oh!

AndiDog Oct 7, 2025

Uh oh!

AndiDog Oct 7, 2025

Uh oh!

AndiDog Oct 7, 2025

Uh oh!

Uh oh!

		// NodegroupRepairConfigToSDK is used to convert a CAPA NodeRepairConfig to AWS SDK NodeRepairConfig.
		func NodegroupRepairConfigToSDK(repairConfig expinfrav1.NodeRepairConfig) ekstypes.NodeRepairConfig {

	func TestNodegroupRepairConfigToSDK(t *testing.T) {
	func TestNodeRepairConfigToSDK(t *testing.T) {

	t.Errorf("NodegroupRepairConfigToSDK() = %v, want %v", result, tt.expected)
	t.Errorf("NodeRepairConfigToSDK() = %v, want %v", result, tt.expected)

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

Are you sure you want to change the base?

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

Conversation

afarbos commented Jul 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Jul 31, 2025

Uh oh!

k8s-ci-robot commented Jul 31, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

afarbos Oct 6, 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!

Choose a reason for hiding this comment

Uh oh!

serngawy commented Oct 1, 2025

Uh oh!

afarbos commented Oct 6, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

afarbos commented Jul 31, 2025 •

edited

Loading

afarbos Oct 6, 2025 •

edited

Loading