test

Author: LiangquanLi930

api/v1beta2/awsmachinetemplate_types.go

@@ -35,6 +35,14 @@ const (
 	ArchitectureArm64 Architecture = "arm64"
 )
 
+// Operating system constants.
+const (
+	// OperatingSystemLinux represents the Linux operating system.
+	OperatingSystemLinux = "linux"
+	// OperatingSystemWindows represents the Windows operating system.
+	OperatingSystemWindows = "windows"
+)
+
 // NodeInfo contains information about the node's architecture and operating system.
 type NodeInfo struct {
 	// Architecture is the CPU architecture of the node.

controllers/awsmachinetemplate_controller.go

@@ -225,22 +225,20 @@ func (r *AWSMachineTemplateReconciler) getNodeInfoFromAMI(ctx context.Context, e
 		arch = infrav1.ArchitectureArm64
 	}
 
-	// Determine OS - check Platform field first (specifically for Windows identification)
-	var os string
+	// Determine OS - default to Linux, change to Windows if detected
+	// Most AMIs are Linux-based, so we initialize with Linux as the default
+	os := infrav1.OperatingSystemLinux
 
 	// 1. Check Platform field (most reliable for Windows detection)
 	if image.Platform == ec2types.PlatformValuesWindows {
-		os = "windows"
+		os = infrav1.OperatingSystemWindows
 	}
 
-	// 2. Check PlatformDetails field (provides more detailed information)
-	if os == "" && image.PlatformDetails != nil {
+	// 2. Check PlatformDetails field for Windows indication
+	if os != infrav1.OperatingSystemWindows && image.PlatformDetails != nil {
 		platformDetails := strings.ToLower(*image.PlatformDetails)
-		switch {
-		case strings.Contains(platformDetails, "windows"):
-			os = "windows"
-		case strings.Contains(platformDetails, "linux"), strings.Contains(platformDetails, "unix"):
-			os = "linux"
+		if strings.Contains(platformDetails, infrav1.OperatingSystemWindows) {
+			os = infrav1.OperatingSystemWindows
 		}
 	}
 

test/e2e/suites/unmanaged/unmanaged_functional_test.go

@@ -337,7 +337,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(),
@@ -359,6 +359,17 @@ 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]: name=%s, instanceType=%s, labels=%v, ownerRefs=%v, capacity=%v, nodeInfo=%v",
+					i, template.Name, template.Spec.Template.Spec.InstanceType,
+					template.Labels, template.OwnerReferences, template.Status.Capacity, template.Status.NodeInfo))
+			}
+
 			foundTemplateWithCapacity := false
 			foundTemplateWithNodeInfo := false
 			for _, template := range awsMachineTemplateList.Items {