Fix node_test

Code refactor for NodeTypeAL2023 enum

Author: AmitSahastra

bootstrap/eks/api/v1beta2/eksconfig_types.go

@@ -22,11 +22,19 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
+// +kubebuilder:validation:Enum=al2023
+type NodeType string
+
+const (
+	// NodeTypeAL2023 represents the AL2023 node type.
+	NodeTypeAL2023 NodeType = "al2023"
+)
+
 // EKSConfigSpec defines the desired state of Amazon EKS Bootstrap Configuration.
 type EKSConfigSpec struct {
 	// NodeType specifies the type of node (e.g., "al2023")
 	// +optional
-	NodeType string `json:"nodeType,omitempty"`
+	NodeType NodeType `json:"nodeType,omitempty"`
 	// KubeletExtraArgs passes the specified kubelet args into the Amazon EKS machine bootstrap script
 	// +optional
 	KubeletExtraArgs map[string]string `json:"kubeletExtraArgs,omitempty"`

bootstrap/eks/controllers/eksconfig_controller.go

@@ -57,11 +57,6 @@ import (
 	"sigs.k8s.io/cluster-api/util/predicates"
 )
 
-const (
-	// NodeTypeAL2023 represents the AL2023 node type.
-	NodeTypeAL2023 = "al2023"
-)
-
 // EKSConfigReconciler reconciles a EKSConfig object.
 type EKSConfigReconciler struct {
 	client.Client
@@ -233,7 +228,7 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
 
 		// For AL2023, requeue to ensure we retry when control plane is ready
 		// For AL2, follow upstream behavior and return nil
-		if config.Spec.NodeType == NodeTypeAL2023 {
+		if config.Spec.NodeType == eksbootstrapv1.NodeTypeAL2023 {
 			log.Info("AL2023 detected, returning requeue after 30 seconds")
 			return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
 		}
@@ -248,7 +243,7 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
 	}
 
 	// Check if control plane is ready (skip in test environments for AL2023)
-	if config.Spec.NodeType == NodeTypeAL2023 && !conditions.IsTrue(controlPlane, ekscontrolplanev1.EKSControlPlaneReadyCondition) {
+	if config.Spec.NodeType == eksbootstrapv1.NodeTypeAL2023 && !conditions.IsTrue(controlPlane, ekscontrolplanev1.EKSControlPlaneReadyCondition) {
 		// Skip control plane readiness check for AL2023 in test environment
 		if os.Getenv("TEST_ENV") != "true" {
 			log.Info("AL2023 detected, waiting for control plane to be ready")
@@ -309,7 +304,7 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
 	}
 
 	// Set AMI family type and AL2023-specific fields if needed
-	if config.Spec.NodeType == NodeTypeAL2023 {
+	if config.Spec.NodeType == eksbootstrapv1.NodeTypeAL2023 {
 		log.Info("Processing AL2023 node type")
 		nodeInput.AMIFamilyType = userdata.AMIFamilyAL2023
 

bootstrap/eks/internal/userdata/node_test.go

@@ -498,7 +498,7 @@ func TestGenerateAL2023UserData(t *testing.T) {
 			expectErr: false,
 			verifyOutput: func(output string) bool {
 				return strings.Contains(output, "name: test-cluster") &&
-					strings.Contains(output, "maxPods: 110") &&
+					strings.Contains(output, "maxPods: 58") &&
 					strings.Contains(output, "nodegroup=test-nodegroup")
 			},
 		},

config/crd/bases/bootstrap.cluster.x-k8s.io_eksconfigs.yaml

@@ -382,6 +382,8 @@ spec:
                 type: array
               nodeType:
                 description: NodeType specifies the type of node (e.g., "al2023")
+                enum:
+                - al2023
                 type: string
               ntp:
                 description: NTP specifies NTP configuration

config/crd/bases/bootstrap.cluster.x-k8s.io_eksconfigtemplates.yaml

@@ -320,6 +320,8 @@ spec:
                         type: array
                       nodeType:
                         description: NodeType specifies the type of node (e.g., "al2023")
+                        enum:
+                        - al2023
                         type: string
                       ntp:
                         description: NTP specifies NTP configuration