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

config/rbac/role.yaml

@@ -101,7 +101,6 @@ rules:
   - controlplane.cluster.x-k8s.io
   resources:
   - '*'
-  - kubeadmcontrolplanes
   verbs:
   - get
   - list

controllers/awsmachinetemplate_controller.go

@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
@@ -52,12 +53,22 @@ 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.ResourceNotPausedAndHasFilterLabel(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
 // +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=clusters,verbs=get;list;watch
 // +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=machinedeployments,verbs=get;list;watch
-// +kubebuilder:rbac:groups=controlplane.cluster.x-k8s.io,resources=kubeadmcontrolplanes,verbs=get;list;watch
 // +kubebuilder:rbac:groups="",resources=events,verbs=get;list;watch;create;update;patch
 
 // Reconcile populates capacity information for AWSMachineTemplate.
@@ -73,11 +84,6 @@ func (r *AWSMachineTemplateReconciler) Reconcile(ctx context.Context, req ctrl.R
 		return ctrl.Result{}, err
 	}
 
-	// Skip if capacity and nodeInfo are already set
-	if len(awsMachineTemplate.Status.Capacity) > 0 && awsMachineTemplate.Status.NodeInfo != nil {
-		return ctrl.Result{}, nil
-	}
-
 	// Get instance type from spec
 	instanceType := awsMachineTemplate.Spec.Template.Spec.InstanceType
 	if instanceType == "" {
@@ -194,8 +200,7 @@ func (r *AWSMachineTemplateReconciler) getInstanceTypeCapacity(ctx context.Conte
 
 	// Memory
 	if info.MemoryInfo != nil && info.MemoryInfo.SizeInMiB != nil {
-		memoryBytes := *info.MemoryInfo.SizeInMiB * 1024 * 1024
-		resourceList[corev1.ResourceMemory] = *resource.NewQuantity(memoryBytes, resource.BinarySI)
+		resourceList[corev1.ResourceMemory] = resource.MustParse(fmt.Sprintf("%dMi", *info.MemoryInfo.SizeInMiB))
 	}
 
 	return resourceList, nil
@@ -363,14 +368,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)
-}

controllers/awsmachinetemplate_controller_unit_test.go

@@ -192,28 +192,6 @@ func TestAWSMachineTemplateReconciler(t *testing.T) {
 	// integration tests.
 
 	t.Run("Reconcile", func(t *testing.T) {
-		t.Run("should skip when capacity and nodeInfo already set", func(t *testing.T) {
-			g := NewWithT(t)
-			template := newAWSMachineTemplate("test-template")
-			template.Status.Capacity = corev1.ResourceList{
-				corev1.ResourceCPU: *resource.NewQuantity(2, resource.DecimalSI),
-			}
-			template.Status.NodeInfo = &infrav1.NodeInfo{
-				Architecture: infrav1.ArchitectureAmd64,
-			}
-
-			reconciler := &AWSMachineTemplateReconciler{
-				Client: newFakeClient(template),
-			}
-
-			result, err := reconciler.Reconcile(context.Background(), ctrl.Request{
-				NamespacedName: client.ObjectKeyFromObject(template),
-			})
-
-			g.Expect(err).To(BeNil())
-			g.Expect(result.Requeue).To(BeFalse())
-		})
-
 		t.Run("should reconcile when capacity set but nodeInfo is not", func(t *testing.T) {
 			g := NewWithT(t)
 			template := newAWSMachineTemplate("test-template")