fix PR: 5711 e2e

Author: LiangquanLi930

controllers/awsmachinetemplate_controller.go

@@ -33,6 +33,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	ekscontrolplanev1 "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2"
@@ -47,6 +48,11 @@ import (
 	"sigs.k8s.io/cluster-api/util/predicates"
 )
 
+const (
+	// awsMachineTemplateKind is the Kind name for AWSMachineTemplate resources.
+	awsMachineTemplateKind = "AWSMachineTemplate"
+)
+
 // AWSMachineTemplateReconciler reconciles AWSMachineTemplate objects.
 //
 // This controller automatically populates capacity information for AWSMachineTemplate resources
@@ -62,11 +68,27 @@ type AWSMachineTemplateReconciler struct {
 func (r *AWSMachineTemplateReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
 	log := logger.FromContext(ctx)
 
-	return ctrl.NewControllerManagedBy(mgr).
+	b := ctrl.NewControllerManagedBy(mgr).
 		For(&infrav1.AWSMachineTemplate{}).
 		WithOptions(options).
 		WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(mgr.GetScheme(), log.GetLogger(), r.WatchFilterValue)).
-		Complete(r)
+		Watches(
+			&clusterv1.MachineDeployment{},
+			handler.EnqueueRequestsFromMapFunc(r.machineDeploymentToAWSMachineTemplate),
+		)
+
+	// Optionally watch KubeadmControlPlane if the CRD exists
+	if _, err := mgr.GetRESTMapper().RESTMapping(schema.GroupKind{Group: controlplanev1.GroupVersion.Group, Kind: "KubeadmControlPlane"}, controlplanev1.GroupVersion.Version); err == nil {
+		b = b.Watches(&controlplanev1.KubeadmControlPlane{},
+			handler.EnqueueRequestsFromMapFunc(r.kubeadmControlPlaneToAWSMachineTemplate))
+	}
+
+	_, err := b.Build(r)
+	if err != nil {
+		return errors.Wrap(err, "failed setting up with a controller manager")
+	}
+
+	return nil
 }
 
 // +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsmachinetemplates,verbs=get;list;watch
@@ -420,3 +442,53 @@ func getParentListOptions(obj metav1.ObjectMeta) ([]client.ListOption, error) {
 	}
 	return listOpts, nil
 }
+
+// kubeadmControlPlaneToAWSMachineTemplate maps KubeadmControlPlane to AWSMachineTemplate reconcile requests.
+// This enables the controller to reconcile AWSMachineTemplate when its owner KubeadmControlPlane is created or updated,
+// ensuring that nodeInfo can be populated even if the cache hasn't synced yet.
+func (r *AWSMachineTemplateReconciler) kubeadmControlPlaneToAWSMachineTemplate(ctx context.Context, o client.Object) []ctrl.Request {
+	kcp, ok := o.(*controlplanev1.KubeadmControlPlane)
+	if !ok {
+		return nil
+	}
+
+	// Check if it references an AWSMachineTemplate
+	if kcp.Spec.MachineTemplate.Spec.InfrastructureRef.Kind != awsMachineTemplateKind {
+		return nil
+	}
+
+	// Return reconcile request for the referenced AWSMachineTemplate
+	return []ctrl.Request{
+		{
+			NamespacedName: client.ObjectKey{
+				Namespace: kcp.Namespace,
+				Name:      kcp.Spec.MachineTemplate.Spec.InfrastructureRef.Name,
+			},
+		},
+	}
+}
+
+// machineDeploymentToAWSMachineTemplate maps MachineDeployment to AWSMachineTemplate reconcile requests.
+// This enables the controller to reconcile AWSMachineTemplate when its owner MachineDeployment is created or updated,
+// ensuring that nodeInfo can be populated even if the cache hasn't synced yet.
+func (r *AWSMachineTemplateReconciler) machineDeploymentToAWSMachineTemplate(ctx context.Context, o client.Object) []ctrl.Request {
+	md, ok := o.(*clusterv1.MachineDeployment)
+	if !ok {
+		return nil
+	}
+
+	// Check if it references an AWSMachineTemplate
+	if md.Spec.Template.Spec.InfrastructureRef.Kind != awsMachineTemplateKind {
+		return nil
+	}
+
+	// Return reconcile request for the referenced AWSMachineTemplate
+	return []ctrl.Request{
+		{
+			NamespacedName: client.ObjectKey{
+				Namespace: md.Namespace,
+				Name:      md.Spec.Template.Spec.InfrastructureRef.Name,
+			},
+		},
+	}
+}

main.go

@@ -65,6 +65,7 @@ import (
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/record"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/version"
+	KubeadmControlPlanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/cluster-api/util/flags"
 )
@@ -79,6 +80,7 @@ func init() {
 	_ = eksbootstrapv1beta1.AddToScheme(scheme)
 	_ = cgscheme.AddToScheme(scheme)
 	_ = clusterv1.AddToScheme(scheme)
+	_ = KubeadmControlPlanev1.AddToScheme(scheme)
 	_ = ekscontrolplanev1.AddToScheme(scheme)
 	_ = ekscontrolplanev1beta1.AddToScheme(scheme)
 	_ = rosacontrolplanev1.AddToScheme(scheme)

test/e2e/suites/unmanaged/unmanaged_functional_test.go

@@ -338,7 +338,7 @@ var _ = ginkgo.Context("[unmanaged] [functional]", func() {
 			configCluster.ControlPlaneMachineCount = ptr.To[int64](1)
 			configCluster.WorkerMachineCount = ptr.To[int64](1)
 			configCluster.Flavor = shared.SSMFlavor
-			_, md, _ := createCluster(ctx, configCluster, result)
+			cluster, md, _ := createCluster(ctx, configCluster, result)
 
 			workerMachines := framework.GetMachinesByMachineDeployments(ctx, framework.GetMachinesByMachineDeploymentsInput{
 				Lister:            e2eCtx.Environment.BootstrapClusterProxy.GetClient(),
@@ -360,19 +360,61 @@ var _ = ginkgo.Context("[unmanaged] [functional]", func() {
 			Expect(err).To(BeNil())
 			Expect(len(awsMachineTemplateList.Items)).To(BeNumerically(">", 0), "Expected at least one AWSMachineTemplate")
 
+			ginkgo.By(fmt.Sprintf("Found %d AWSMachineTemplates", len(awsMachineTemplateList.Items)))
+			ginkgo.By(fmt.Sprintf("Cluster: name=%s, namespace=%s, infrastructureRef=%v",
+				cluster.Name, cluster.Namespace, cluster.Spec.InfrastructureRef))
+
+			// Print each AWSMachineTemplate for debugging
+			for i, template := range awsMachineTemplateList.Items {
+				ginkgo.By(fmt.Sprintf("AWSMachineTemplate[%d]: %+v", i, template))
+			}
+
 			foundTemplateWithCapacity := false
 			foundTemplateWithNodeInfo := false
-			for _, template := range awsMachineTemplateList.Items {
+			ginkgo.By(fmt.Sprintf("DEBUG: Found %d AWSMachineTemplates in namespace %s", len(awsMachineTemplateList.Items), namespace.Name))
+			for i, template := range awsMachineTemplateList.Items {
+				ginkgo.By(fmt.Sprintf("DEBUG: Template[%d] - Name: %s", i, template.Name))
+				ginkgo.By(fmt.Sprintf("DEBUG: Template[%d] - Spec.Template.Spec.InstanceType: %s", i, template.Spec.Template.Spec.InstanceType))
+				ginkgo.By(fmt.Sprintf("DEBUG: Template[%d] - Status.Capacity: %v", i, template.Status.Capacity))
+				ginkgo.By(fmt.Sprintf("DEBUG: Template[%d] - Status.NodeInfo: %+v", i, template.Status.NodeInfo))
+				ginkgo.By(fmt.Sprintf("DEBUG: Template[%d] - Status.Conditions: %+v", i, template.Status.Conditions))
+
 				if len(template.Status.Capacity) > 0 {
 					foundTemplateWithCapacity = true
 					ginkgo.By(fmt.Sprintf("AWSMachineTemplate %s has capacity populated: %v", template.Name, template.Status.Capacity))
 					Expect(template.Status.Capacity).To(HaveKey(corev1.ResourceCPU), "Expected CPU to be set in capacity")
 					Expect(template.Status.Capacity).To(HaveKey(corev1.ResourceMemory), "Expected Memory to be set in capacity")
+				} else {
+					ginkgo.By(fmt.Sprintf("WARNING: Template %s has NO capacity populated", template.Name))
 				}
 				if template.Status.NodeInfo != nil {
 					foundTemplateWithNodeInfo = true
 					ginkgo.By(fmt.Sprintf("AWSMachineTemplate %s has nodeInfo populated: %v", template.Name, template.Status.NodeInfo))
 					// Verify architecture is set (should be either amd64 or arm64 for AWS)
+					ginkgo.By(fmt.Sprintf("DEBUG: Template %s - NodeInfo.Architecture: '%s' (len: %d)", template.Name, template.Status.NodeInfo.Architecture, len(template.Status.NodeInfo.Architecture)))
+					ginkgo.By(fmt.Sprintf("DEBUG: Template %s - NodeInfo.OperatingSystem: '%s' (len: %d)", template.Name, template.Status.NodeInfo.OperatingSystem, len(template.Status.NodeInfo.OperatingSystem)))
+
+					// Verify architecture is set (should be either amd64 or arm64 for AWS)
+					if len(template.Status.NodeInfo.Architecture) == 0 {
+						ginkgo.By(fmt.Sprintf("ERROR: Template %s has empty Architecture field in NodeInfo", template.Name))
+					}
+					Expect(template.Status.NodeInfo.Architecture).ToNot(BeEmpty(), fmt.Sprintf("Expected architecture to be set in nodeInfo for template %s", template.Name))
+					Expect(string(template.Status.NodeInfo.Architecture)).To(MatchRegexp("^(amd64|arm64)$"), fmt.Sprintf("Expected architecture to be amd64 or arm64 for template %s", template.Name))
+					// Verify operating system is set (if available)
+					// Note: OperatingSystem may be empty when:
+					// 1. No explicit AMI ID is specified
+					// 2. Kubernetes version cannot be determined (MachineDeployment not yet created)
+					// 3. AMI lookup fails
+					// In these cases, the controller falls back to instance type architecture only.
+					// See: controllers/awsmachinetemplate_controller.go:319-323 (Strategy 3)
+					if len(template.Status.NodeInfo.OperatingSystem) == 0 {
+						ginkgo.By(fmt.Sprintf("INFO: Template %s has empty OperatingSystem (this is acceptable in fallback scenarios)", template.Name))
+						ginkgo.By(fmt.Sprintf("DEBUG: Template %s full status: %+v", template.Name, template.Status))
+					} else {
+						ginkgo.By(fmt.Sprintf("INFO: Template %s has OperatingSystem set to: %s", template.Name, template.Status.NodeInfo.OperatingSystem))
+						// If OperatingSystem is set, verify it's a valid value
+						Expect(string(template.Status.NodeInfo.OperatingSystem)).To(MatchRegexp("^(linux|windows)$"), fmt.Sprintf("Expected operatingSystem to be linux or windows for template %s", template.Name))
+					}
 					Expect(template.Status.NodeInfo.Architecture).ToNot(BeEmpty(), "Expected architecture to be set in nodeInfo")
 					Expect(string(template.Status.NodeInfo.Architecture)).To(MatchRegexp("^(amd64|arm64)$"), "Expected architecture to be amd64 or arm64")
 					// Verify operating system is set