Fix review comments 2

Author: LiangquanLi930

api/v1beta2/awsmachinetemplate_types.go

@@ -33,12 +33,16 @@ const (
 	ArchitectureArm64 Architecture = "arm64"
 )
 
+// OperatingSystem represents the operating system of the node.
+// Its underlying type is a string and its value can be any of linux, windows.
+type OperatingSystem string
+
 // Operating system constants.
 const (
 	// OperatingSystemLinux represents the Linux operating system.
-	OperatingSystemLinux = "linux"
+	OperatingSystemLinux OperatingSystem = "linux"
 	// OperatingSystemWindows represents the Windows operating system.
-	OperatingSystemWindows = "windows"
+	OperatingSystemWindows OperatingSystem = "windows"
 )
 
 // NodeInfo contains information about the node's architecture and operating system.
@@ -48,11 +52,11 @@ type NodeInfo struct {
 	// +kubebuilder:validation:Enum=amd64;arm64
 	// +optional
 	Architecture Architecture `json:"architecture,omitempty"`
-	// OperatingSystem is a string representing the operating system of the node.
-	// This may be a string like 'linux' or 'windows'.
+	// OperatingSystem is the operating system of the node.
+	// Its underlying type is a string and its value can be any of linux, windows.
 	// +kubebuilder:validation:Enum=linux;windows
 	// +optional
-	OperatingSystem string `json:"operatingSystem,omitempty"`
+	OperatingSystem OperatingSystem `json:"operatingSystem,omitempty"`
 }
 
 // AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.

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

@@ -1172,8 +1172,8 @@ spec:
                     type: string
                   operatingSystem:
                     description: |-
-                      OperatingSystem is a string representing the operating system of the node.
-                      This may be a string like 'linux' or 'windows'.
+                      OperatingSystem is the operating system of the node.
+                      Its underlying type is a string and its value can be any of linux, windows.
                     enum:
                     - linux
                     - windows

controllers/awsmachinetemplate_controller.go

@@ -288,7 +288,7 @@ func (r *AWSMachineTemplateReconciler) getNodeInfo(ctx context.Context, ec2Clien
 }
 
 // getNodeInfoFromAMI queries the AMI to determine architecture and operating system.
-func (r *AWSMachineTemplateReconciler) getNodeInfoFromAMI(ctx context.Context, ec2Client *ec2.Client, amiID string) (infrav1.Architecture, string, error) {
+func (r *AWSMachineTemplateReconciler) getNodeInfoFromAMI(ctx context.Context, ec2Client *ec2.Client, amiID string) (infrav1.Architecture, infrav1.OperatingSystem, error) {
 	input := &ec2.DescribeImagesInput{
 		ImageIds: []string{amiID},
 	}
@@ -325,7 +325,7 @@ func (r *AWSMachineTemplateReconciler) getNodeInfoFromAMI(ctx context.Context, e
 	// 2. Check PlatformDetails field for Windows indication
 	if os != infrav1.OperatingSystemWindows && image.PlatformDetails != nil {
 		platformDetails := strings.ToLower(*image.PlatformDetails)
-		if strings.Contains(platformDetails, infrav1.OperatingSystemWindows) {
+		if strings.Contains(platformDetails, string(infrav1.OperatingSystemWindows)) {
 			os = infrav1.OperatingSystemWindows
 		}
 	}