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

Author: afarbos

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml

@@ -969,6 +969,17 @@ spec:
                   - name
                   type: object
                 type: array
+              nodeRepairConfig:
+                description: NodeRepairConfig specifies the node auto repair configuration
+                  for the managed node group.
+                properties:
+                  enabled:
+                    default: false
+                    description: |-
+                      Enabled specifies whether node auto repair is enabled for the node group.
+                      When enabled, EKS will automatically repair unhealthy nodes by replacing them.
+                    type: boolean
+                type: object
               providerIDList:
                 description: |-
                   ProviderIDList are the provider IDs of instances in the

exp/api/v1beta1/zz_generated.conversion.go

@@ -214,6 +214,10 @@ type AWSManagedMachinePoolSpec struct {
 	// AWSLifecycleHooks specifies lifecycle hooks for the managed node group.
 	// +optional
 	AWSLifecycleHooks []AWSLifecycleHook `json:"lifecycleHooks,omitempty"`
+
+	// NodeRepairConfig specifies the node auto repair configuration for the managed node group.
+	// +optional
+	NodeRepairConfig *NodeRepairConfig `json:"nodeRepairConfig,omitempty"`
 }
 
 // ManagedMachinePoolScaling specifies scaling options.
@@ -297,6 +301,15 @@ type AWSManagedMachinePoolStatus struct {
 	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 }
 
+// NodeRepairConfig defines the node auto repair configuration for managed node groups.
+type NodeRepairConfig struct {
+	// Enabled specifies whether node auto repair is enabled for the node group.
+	// When enabled, EKS will automatically repair unhealthy nodes by replacing them.
+	// +optional
+	// +kubebuilder:default=false
+	Enabled *bool `json:"enabled,omitempty"`
+}
+
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=awsmanagedmachinepools,scope=Namespaced,categories=cluster-api,shortName=awsmmp
 // +kubebuilder:storageversion

exp/api/v1beta2/awsmanagedmachinepool_types.go

@@ -217,6 +217,31 @@ func NodegroupUpdateconfigFromSDK(ngUpdateConfig *ekstypes.NodegroupUpdateConfig
 	return converted
 }
 
+// NodegroupRepairConfigToSDK is used to convert a CAPA NodeRepairConfig to AWS SDK NodeRepairConfig.
+func NodegroupRepairConfigToSDK(repairConfig *expinfrav1.NodeRepairConfig) *ekstypes.NodeRepairConfig {
+	if repairConfig == nil {
+		// Default to disabled if not specified to avoid behavior changes
+		return &ekstypes.NodeRepairConfig{
+			Enabled: aws.Bool(false),
+		}
+	}
+
+	return &ekstypes.NodeRepairConfig{
+		Enabled: repairConfig.Enabled,
+	}
+}
+
+// NodegroupRepairConfigFromSDK is used to convert a AWS SDK NodeRepairConfig to a CAPA NodeRepairConfig.
+func NodegroupRepairConfigFromSDK(ngRepairConfig *ekstypes.NodeRepairConfig) *expinfrav1.NodeRepairConfig {
+	if ngRepairConfig == nil {
+		return nil
+	}
+
+	return &expinfrav1.NodeRepairConfig{
+		Enabled: ngRepairConfig.Enabled,
+	}
+}
+
 // AMITypeToSDK converts a CAPA ManagedMachineAMIType to AWS SDK AMIType.
 func AMITypeToSDK(amiType expinfrav1.ManagedMachineAMIType) ekstypes.AMITypes {
 	switch amiType {

exp/api/v1beta2/zz_generated.deepcopy.go

@@ -0,0 +1,108 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package converters
+
+import (
+	"testing"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types"
+	"github.com/google/go-cmp/cmp"
+
+	expinfrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/exp/api/v1beta2"
+)
+
+func TestNodegroupRepairConfigToSDK(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    *expinfrav1.NodeRepairConfig
+		expected *ekstypes.NodeRepairConfig
+	}{
+		{
+			name:     "nil input returns default disabled",
+			input:    nil,
+			expected: &ekstypes.NodeRepairConfig{Enabled: aws.Bool(false)},
+		},
+		{
+			name: "enabled repair config",
+			input: &expinfrav1.NodeRepairConfig{
+				Enabled: aws.Bool(true),
+			},
+			expected: &ekstypes.NodeRepairConfig{Enabled: aws.Bool(true)},
+		},
+		{
+			name: "disabled repair config",
+			input: &expinfrav1.NodeRepairConfig{
+				Enabled: aws.Bool(false),
+			},
+			expected: &ekstypes.NodeRepairConfig{Enabled: aws.Bool(false)},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := NodegroupRepairConfigToSDK(tt.input)
+			if result == nil && tt.expected == nil {
+				return
+			}
+			if result == nil || tt.expected == nil {
+				t.Errorf("NodegroupRepairConfigToSDK() = %v, want %v", result, tt.expected)
+				return
+			}
+			if *result.Enabled != *tt.expected.Enabled {
+				t.Errorf("NodegroupRepairConfigToSDK().Enabled = %v, want %v", *result.Enabled, *tt.expected.Enabled)
+			}
+		})
+	}
+}
+
+func TestNodegroupRepairConfigFromSDK(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    *ekstypes.NodeRepairConfig
+		expected *expinfrav1.NodeRepairConfig
+	}{
+		{
+			name:     "nil input returns nil",
+			input:    nil,
+			expected: nil,
+		},
+		{
+			name: "enabled repair config",
+			input: &ekstypes.NodeRepairConfig{
+				Enabled: aws.Bool(true),
+			},
+			expected: &expinfrav1.NodeRepairConfig{Enabled: aws.Bool(true)},
+		},
+		{
+			name: "disabled repair config",
+			input: &ekstypes.NodeRepairConfig{
+				Enabled: aws.Bool(false),
+			},
+			expected: &expinfrav1.NodeRepairConfig{Enabled: aws.Bool(false)},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := NodegroupRepairConfigFromSDK(tt.input)
+			if !cmp.Equal(result, tt.expected) {
+				t.Errorf("NodegroupRepairConfigFromSDK() = %v, want %v", result, tt.expected)
+			}
+		})
+	}
+}

pkg/cloud/converters/eks.go

@@ -119,6 +119,11 @@ func (s *NodegroupService) updateConfig() (*ekstypes.NodegroupUpdateConfig, erro
 	return converters.NodegroupUpdateconfigToSDK(updateConfig)
 }
 
+func (s *NodegroupService) nodeRepairConfig() *ekstypes.NodeRepairConfig {
+	repairConfig := s.scope.ManagedMachinePool.Spec.NodeRepairConfig
+	return converters.NodegroupRepairConfigToSDK(repairConfig)
+}
+
 func (s *NodegroupService) roleArn(ctx context.Context) (*string, error) {
 	var role *iamtypes.Role
 	if s.scope.RoleName() != "" {
@@ -249,6 +254,9 @@ func (s *NodegroupService) createNodegroup(ctx context.Context) (*ekstypes.Nodeg
 			Version: s.scope.ManagedMachinePool.Status.LaunchTemplateVersion,
 		}
 	}
+	if managedPool.NodeRepairConfig != nil {
+		input.NodeRepairConfig = s.nodeRepairConfig()
+	}
 
 	out, err := s.EKSClient.CreateNodegroup(ctx, input)
 	if err != nil {
@@ -480,6 +488,16 @@ func (s *NodegroupService) reconcileNodegroupConfig(ctx context.Context, ng *eks
 		input.UpdateConfig = updatedConfig
 		needsUpdate = true
 	}
+
+	// Check if node repair configuration needs to be updated
+	currentRepairConfig := converters.NodegroupRepairConfigFromSDK(ng.NodeRepairConfig)
+	specRepairConfig := s.scope.ManagedMachinePool.Spec.NodeRepairConfig
+	if !cmp.Equal(currentRepairConfig, specRepairConfig) {
+		s.Debug("Nodegroup repair configuration differs from spec, updating the nodegroup repair config", "nodegroup", ng.NodegroupName)
+		input.NodeRepairConfig = s.nodeRepairConfig()
+		needsUpdate = true
+	}
+
 	if !needsUpdate {
 		s.Debug("node group config update not needed", "cluster", eksClusterName, "name", *ng.NodegroupName)
 		return nil