Fix review comments

Author: LiangquanLi930

api/v1beta2/awsmachinetemplate_types.go

@@ -25,8 +25,6 @@ import (
 
 // Architecture represents the CPU architecture of the node.
 // Its underlying type is a string and its value can be any of amd64, arm64.
-// +kubebuilder:validation:Enum=amd64;arm64
-// +enum
 type Architecture string
 
 // Architecture constants.
@@ -47,10 +45,12 @@ const (
 type NodeInfo struct {
 	// Architecture is the CPU architecture of the node.
 	// Its underlying type is a string and its value can be any of amd64, arm64.
+	// +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'.
+	// +kubebuilder:validation:Enum=linux;windows
 	// +optional
 	OperatingSystem string `json:"operatingSystem,omitempty"`
 }

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

@@ -1174,6 +1174,9 @@ spec:
                     description: |-
                       OperatingSystem is a string representing the operating system of the node.
                       This may be a string like 'linux' or 'windows'.
+                    enum:
+                    - linux
+                    - windows
                     type: string
                 type: object
             type: object

controllers/awsmachinetemplate_controller.go

@@ -52,6 +52,17 @@ type AWSMachineTemplateReconciler struct {
 	WatchFilterValue string
 }
 
+// SetupWithManager sets up the controller with the Manager.
+func (r *AWSMachineTemplateReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
+	log := logger.FromContext(ctx)
+
+	return ctrl.NewControllerManagedBy(mgr).
+		For(&infrav1.AWSMachineTemplate{}).
+		WithOptions(options).
+		WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), log.GetLogger(), r.WatchFilterValue)).
+		Complete(r)
+}
+
 // +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsmachinetemplates,verbs=get;list;watch
 // +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsmachinetemplates/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsclusters,verbs=get;list;watch
@@ -363,14 +374,3 @@ func (r *AWSMachineTemplateReconciler) getKubernetesVersion(ctx context.Context,
 
 	return "", errors.New("no MachineDeployment or KubeadmControlPlane found referencing this AWSMachineTemplate with a version")
 }
-
-// SetupWithManager sets up the controller with the Manager.
-func (r *AWSMachineTemplateReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
-	log := logger.FromContext(ctx)
-
-	return ctrl.NewControllerManagedBy(mgr).
-		For(&infrav1.AWSMachineTemplate{}).
-		WithOptions(options).
-		WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), log.GetLogger(), r.WatchFilterValue)).
-		Complete(r)
-}