fix lint error

Author: AmitSahastra

bootstrap/eks/controllers/eksconfig_controller.go

@@ -57,6 +57,11 @@ 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
@@ -229,7 +234,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 == "al2023" {
+		if config.Spec.NodeType == NodeTypeAL2023 {
 			log.Info("AL2023 detected, returning requeue after 30 seconds")
 			return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
 		}
@@ -244,16 +249,16 @@ 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 == "al2023" && !conditions.IsTrue(controlPlane, ekscontrolplanev1.EKSControlPlaneReadyCondition) {
-		// In test environments, skip the control plane readiness check for AL2023
-		if os.Getenv("TEST_ENV") == "true" {
-			// Skipping control plane readiness check for AL2023 in test environment
-		} else {
+	if config.Spec.NodeType == 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")
 			conditions.MarkFalse(config, eksbootstrapv1.DataSecretAvailableCondition,
 				eksbootstrapv1.DataSecretGenerationFailedReason,
 				clusterv1.ConditionSeverityInfo, "Control plane is not ready yet")
 			return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
 		}
+		log.Info("Skipping control plane readiness check for AL2023 in test environment")
 	}
 	log.Info("Control plane is ready, proceeding with userdata generation")
 
@@ -304,7 +309,7 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
 	}
 
 	// Set AMI family type and AL2023-specific fields if needed
-	if config.Spec.NodeType == "al2023" {
+	if config.Spec.NodeType == NodeTypeAL2023 {
 		log.Info("Processing AL2023 node type")
 		nodeInput.AMIFamilyType = userdata.AMIFamilyAL2023
 

bootstrap/eks/controllers/eksconfig_controller_reconciler_test.go

@@ -367,32 +367,6 @@ func newCluster(name string) *clusterv1.Cluster {
 	return cluster
 }
 
-// newClusterWithoutControlPlaneInitialized returns a CAPI cluster object without setting ControlPlaneInitializedCondition.
-func newClusterWithoutControlPlaneInitialized(name string) *clusterv1.Cluster {
-	cluster := &clusterv1.Cluster{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Cluster",
-			APIVersion: clusterv1.GroupVersion.String(),
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Namespace: "default",
-			Name:      name,
-		},
-		Spec: clusterv1.ClusterSpec{
-			ControlPlaneRef: &corev1.ObjectReference{
-				Name:      name,
-				Kind:      "AWSManagedControlPlane",
-				Namespace: "default",
-			},
-		},
-		Status: clusterv1.ClusterStatus{
-			InfrastructureReady: true,
-		},
-	}
-	// Don't set ControlPlaneInitializedCondition
-	return cluster
-}
-
 func dump(desc string, o interface{}) string {
 	dat, _ := yaml.Marshal(o)
 	return fmt.Sprintf("%s:\n%s", desc, string(dat))