review fixes

Author: chrischdi

.golangci.yml

@@ -86,7 +86,7 @@ linters-settings:
       limitations under the License.
   importas:
     alias:
-      - pkg: "sigs.k8s.io/cluster-api/api/v1beta1"
+      - pkg: "sigs.k8s.io/cluster-api/api/core/v1beta1"
         alias: clusterv1beta1
       - pkg: "sigs.k8s.io/cluster-api/util/conditions" 
         #pkg: "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"

pkg/controllers/machinesync/machine_sync_controller.go

@@ -1059,7 +1059,7 @@ func (r *MachineSyncReconciler) fetchCAPIInfraMachine(ctx context.Context, name,
 }
 
 // doesCAPIInfraMachineExist checks if the Cluster API Infrastructure Machine exists. It uses the infrastructureRef of the Cluster API Machine with fallback to the name of the MAPI Machine.
-func (r *MachineSyncReconciler) doesCAPIInfraMachineExist(ctx context.Context, capiMachine *clusterv1.Machine, mapiMachine *mapiv1beta1.Machine) (bool, error) {
+func (r *MachineSyncReconciler) doesCAPIInfraMachineExist(ctx context.Context, capiMachine *clusterv1beta1.Machine, mapiMachine *mapiv1beta1.Machine) (bool, error) {
 	namespace := r.CAPINamespace
 	name := mapiMachine.Name
 

pkg/controllers/machinesync/machine_sync_controller_unit_test.go

@@ -23,23 +23,23 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	awsv1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
 // Unit tests for fetchCAPIInfraResources because reconciling deletion depends on it.
 var _ = Describe("Unit tests for fetchCAPIInfraResources", func() {
 	var reconciler *MachineSyncReconciler
-	var capiMachine *clusterv1.Machine
+	var capiMachine *clusterv1beta1.Machine
 
 	BeforeEach(func() {
-		capiMachine = &clusterv1.Machine{
+		capiMachine = &clusterv1beta1.Machine{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "test-machine",
 				Namespace: "test-namespace",
 			},
-			Spec: clusterv1.MachineSpec{
+			Spec: clusterv1beta1.MachineSpec{
 				ClusterName: "test-cluster",
 				InfrastructureRef: corev1.ObjectReference{
 					Kind:      "AWSMachine",