Fix review comments 3

Author: LiangquanLi930

controllers/awsmachinetemplate_controller.go

@@ -27,6 +27,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -359,24 +362,28 @@ func (r *AWSMachineTemplateReconciler) getNodeInfoFromAMI(ctx context.Context, e
 // getKubernetesVersion attempts to find the Kubernetes version by querying MachineDeployments
 // or KubeadmControlPlanes that reference this AWSMachineTemplate.
 func (r *AWSMachineTemplateReconciler) getKubernetesVersion(ctx context.Context, template *infrav1.AWSMachineTemplate) (string, error) {
+	listOpts, err := getParentListOptions(template.ObjectMeta)
+	if err != nil {
+		return "", errors.Wrap(err, "failed to get parent list options")
+	}
+
 	// Try to find version from MachineDeployment first
 	machineDeploymentList := &clusterv1.MachineDeploymentList{}
-	if err := r.List(ctx, machineDeploymentList, client.InNamespace(template.Namespace)); err != nil {
+	if err := r.List(ctx, machineDeploymentList, listOpts...); err != nil {
 		return "", errors.Wrap(err, "failed to list MachineDeployments")
 	}
 
 	// Find MachineDeployments that reference this AWSMachineTemplate
 	for _, md := range machineDeploymentList.Items {
-		if md.Spec.Template.Spec.InfrastructureRef.Kind == "AWSMachineTemplate" &&
-			md.Spec.Template.Spec.InfrastructureRef.Name == template.Name &&
-			md.Spec.Template.Spec.Version != nil {
-			return *md.Spec.Template.Spec.Version, nil
+		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 not found in MachineDeployment, try KubeadmControlPlane
 	kcpList := &controlplanev1.KubeadmControlPlaneList{}
-	if err := r.List(ctx, kcpList, client.InNamespace(template.Namespace)); err != nil {
+	if err := r.List(ctx, kcpList, listOpts...); err != nil {
 		return "", errors.Wrap(err, "failed to list KubeadmControlPlanes")
 	}
 
@@ -391,3 +398,26 @@ func (r *AWSMachineTemplateReconciler) getKubernetesVersion(ctx context.Context,
 
 	return "", errors.New("no MachineDeployment or KubeadmControlPlane found referencing this AWSMachineTemplate with a version")
 }
+
+func getParentListOptions(obj metav1.ObjectMeta) ([]client.ListOption, error) {
+	listOpts := []client.ListOption{
+		client.InNamespace(obj.Namespace),
+	}
+
+	for _, ref := range obj.GetOwnerReferences() {
+		if ref.Kind != "Cluster" {
+			continue
+		}
+		gv, err := schema.ParseGroupVersion(ref.APIVersion)
+		if err != nil {
+			return nil, errors.WithStack(err)
+		}
+		if gv.Group == clusterv1.GroupVersion.Group {
+			listOpts = append(listOpts, client.MatchingLabels{
+				clusterv1.ClusterNameLabel: ref.Name,
+			})
+			break
+		}
+	}
+	return listOpts, nil
+}