rebase #5720

Author: LiangquanLi930

api/v1beta1/zz_generated.conversion.go

@@ -75,7 +75,7 @@ type AWSMachineTemplateStatus struct {
 
 	// Conditions defines current service state of the AWSMachineTemplate.
 	// +optional
-	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+	Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
 }
 
 // AWSMachineTemplateSpec defines the desired state of AWSMachineTemplate.
@@ -119,12 +119,12 @@ type AWSMachineTemplateResource struct {
 }
 
 // GetConditions returns the observations of the operational state of the AWSMachineTemplate resource.
-func (r *AWSMachineTemplate) GetConditions() clusterv1.Conditions {
+func (r *AWSMachineTemplate) GetConditions() clusterv1beta1.Conditions {
 	return r.Status.Conditions
 }
 
-// SetConditions sets the underlying service state of the AWSMachineTemplate to the predescribed clusterv1.Conditions.
-func (r *AWSMachineTemplate) SetConditions(conditions clusterv1.Conditions) {
+// SetConditions sets the underlying service state of the AWSMachineTemplate to the predescribed clusterv1beta1.Conditions.
+func (r *AWSMachineTemplate) SetConditions(conditions clusterv1beta1.Conditions) {
 	r.Status.Conditions = conditions
 }
 

api/v1beta2/awsmachinetemplate_types.go

@@ -41,8 +41,8 @@ import (
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/record"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/util/paused"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
+	controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/predicates"
 )
@@ -176,7 +176,7 @@ func (r *AWSMachineTemplateReconciler) getRegion(ctx context.Context, cluster *c
 	}
 
 	// Get region from AWSCluster (standard EC2-based cluster)
-	if cluster.Spec.InfrastructureRef != nil && cluster.Spec.InfrastructureRef.Kind == "AWSCluster" {
+	if cluster.Spec.InfrastructureRef.IsDefined() && cluster.Spec.InfrastructureRef.Kind == "AWSCluster" {
 		awsCluster := &infrav1.AWSCluster{}
 		if err := r.Get(ctx, client.ObjectKey{
 			Namespace: cluster.Namespace,
@@ -191,7 +191,7 @@ func (r *AWSMachineTemplateReconciler) getRegion(ctx context.Context, cluster *c
 	}
 
 	// Get region from AWSManagedControlPlane (EKS cluster)
-	if cluster.Spec.ControlPlaneRef != nil && cluster.Spec.ControlPlaneRef.Kind == "AWSManagedControlPlane" {
+	if cluster.Spec.ControlPlaneRef.IsDefined() && cluster.Spec.ControlPlaneRef.Kind == "AWSManagedControlPlane" {
 		awsManagedCP := &ekscontrolplanev1.AWSManagedControlPlane{}
 		if err := r.Get(ctx, client.ObjectKey{
 			Namespace: cluster.Namespace,
@@ -373,9 +373,10 @@ func (r *AWSMachineTemplateReconciler) getKubernetesVersion(ctx context.Context,
 
 	// Find MachineDeployments that reference this AWSMachineTemplate
 	for _, md := range machineDeploymentList.Items {
-		if version := ptr.Deref(md.Spec.Template.Spec.Version, ""); md.Spec.Template.Spec.InfrastructureRef.Kind == "AWSMachineTemplate" &&
-			md.Spec.Template.Spec.InfrastructureRef.Name == template.Name && version != "" {
-			return version, nil
+		if md.Spec.Template.Spec.InfrastructureRef.Kind == "AWSMachineTemplate" &&
+			md.Spec.Template.Spec.InfrastructureRef.Name == template.Name &&
+			md.Spec.Template.Spec.Version != "" {
+			return md.Spec.Template.Spec.Version, nil
 		}
 	}
 
@@ -387,8 +388,8 @@ func (r *AWSMachineTemplateReconciler) getKubernetesVersion(ctx context.Context,
 
 	// Find KubeadmControlPlanes that reference this AWSMachineTemplate
 	for _, kcp := range kcpList.Items {
-		if kcp.Spec.MachineTemplate.InfrastructureRef.Kind == "AWSMachineTemplate" &&
-			kcp.Spec.MachineTemplate.InfrastructureRef.Name == template.Name &&
+		if kcp.Spec.MachineTemplate.Spec.InfrastructureRef.Kind == "AWSMachineTemplate" &&
+			kcp.Spec.MachineTemplate.Spec.InfrastructureRef.Name == template.Name &&
 			kcp.Spec.Version != "" {
 			return kcp.Spec.Version, nil
 		}