add AWSMachineTemplate NodeInfo

Author: LiangquanLi930

api/v1beta1/awsmachine_conversion.go

@@ -136,6 +136,9 @@ func (r *AWSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 		}
 	}
 
+	// Restore Status fields that don't exist in v1beta1.
+	dst.Status.NodeInfo = restored.Status.NodeInfo
+
 	return nil
 }
 

api/v1beta1/conversion.go

@@ -108,3 +108,8 @@ func Convert_v1beta2_AWSMachineStatus_To_v1beta1_AWSMachineStatus(in *v1beta2.AW
 	// Note: DedicatedHostID is not present in v1beta1, so it will be dropped during conversion
 	return autoConvert_v1beta2_AWSMachineStatus_To_v1beta1_AWSMachineStatus(in, out, s)
 }
+
+func Convert_v1beta2_AWSMachineTemplateStatus_To_v1beta1_AWSMachineTemplateStatus(in *v1beta2.AWSMachineTemplateStatus, out *AWSMachineTemplateStatus, s conversion.Scope) error {
+	// NodeInfo field is ignored (dropped) as it doesn't exist in v1beta1
+	return autoConvert_v1beta2_AWSMachineTemplateStatus_To_v1beta1_AWSMachineTemplateStatus(in, out, s)
+}

api/v1beta1/zz_generated.conversion.go

@@ -23,13 +23,51 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
+// 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.
+const (
+	ArchitectureAmd64 Architecture = "amd64"
+	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.
+	// Its underlying type is a string and its value can be any of 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'.
+	// +optional
+	OperatingSystem string `json:"operatingSystem,omitempty"`
+}
+
 // AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.
 type AWSMachineTemplateStatus struct {
 	// Capacity defines the resource capacity for this machine.
 	// This value is used for autoscaling from zero operations as defined in:
 	// https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210310-opt-in-autoscaling-from-zero.md
 	// +optional
 	Capacity corev1.ResourceList `json:"capacity,omitempty"`
+
+	// NodeInfo contains information about the node's architecture and operating system.
+	// This value is used for autoscaling from zero operations as defined in:
+	// https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210310-opt-in-autoscaling-from-zero.md
+	// +optional
+	NodeInfo *NodeInfo `json:"nodeInfo,omitempty"`
 }
 
 // AWSMachineTemplateSpec defines the desired state of AWSMachineTemplate.

api/v1beta2/awsmachinetemplate_types.go

@@ -1156,6 +1156,26 @@ spec:
                   This value is used for autoscaling from zero operations as defined in:
                   https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210310-opt-in-autoscaling-from-zero.md
                 type: object
+              nodeInfo:
+                description: |-
+                  NodeInfo contains information about the node's architecture and operating system.
+                  This value is used for autoscaling from zero operations as defined in:
+                  https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210310-opt-in-autoscaling-from-zero.md
+                properties:
+                  architecture:
+                    description: |-
+                      Architecture is the CPU architecture of the node.
+                      Its underlying type is a string and its value can be any of amd64, arm64.
+                    enum:
+                    - amd64
+                    - arm64
+                    type: string
+                  operatingSystem:
+                    description: |-
+                      OperatingSystem is a string representing the operating system of the node.
+                      This may be a string like 'linux' or 'windows'.
+                    type: string
+                type: object
             type: object
         type: object
     served: true

api/v1beta2/zz_generated.deepcopy.go

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