address comments

Author: richardchen331

exp/controllers/awsmanagedmachinepool_controller.go

@@ -262,7 +262,7 @@ func (r *AWSManagedMachinePoolReconciler) reconcileDelete(
 		}
 
 		if launchTemplate == nil {
-			machinePoolScope.V(2).Info("Unable to locate launch template")
+			machinePoolScope.V(2).Info("Unable to find matching launch template")
 			r.Recorder.Eventf(machinePoolScope.ManagedMachinePool, corev1.EventTypeNormal, "NoLaunchTemplateFound", "Unable to find matching launch template")
 			controllerutil.RemoveFinalizer(machinePoolScope.ManagedMachinePool, expinfrav1.ManagedMachinePoolFinalizer)
 			return ctrl.Result{}, nil

pkg/cloud/services/ec2/launchtemplate.go

@@ -153,7 +153,9 @@ func (s *Service) ReconcileLaunchTemplate(
 		}
 
 		scope.SetLaunchTemplateLatestVersionStatus(version)
-		return scope.PatchObject()
+		if err := scope.PatchObject(); err != nil {
+			return err
+		}
 	}
 
 	if needsUpdate || tagsChanged || *imageID != *launchTemplate.AMI.ID {

test/e2e/data/eks/cluster-template-eks-managed-machinepool-with-launch-template-only.yaml

@@ -7,7 +7,7 @@ spec:
   replicas: ${WORKER_MACHINE_COUNT}
   template:
     spec:
-      version: "EKS_KUBERNETES_VERSION"
+      version: "${KUBERNETES_VERSION}"
       clusterName: "${CLUSTER_NAME}"
       bootstrap:
         dataSecretName: "${CLUSTER_NAME}-pool-lt-0-userdata"