Resolve conflicts with main

Signed-off-by: Borja Clemente <bclement@redhat.com>

Author: clebs

api/v1beta2/awsmachinetemplate_webhook.go

@@ -172,7 +172,7 @@ func (r *AWSMachineTemplate) validateIgnitionAndCloudInit() field.ErrorList {
 
 	return allErrs
 }
-<<<<<<< HEAD
+
 func (r *AWSMachineTemplate) validateHostAllocation() field.ErrorList {
 	var allErrs field.ErrorList
 
@@ -188,8 +188,6 @@ func (r *AWSMachineTemplate) validateHostAllocation() field.ErrorList {
 
 	return allErrs
 }
-=======
->>>>>>> c3fc709ee (Consolidate conditions imports and fix linting)
 
 func (r *AWSMachineTemplate) validateSSHKeyName() field.ErrorList {
 	return validateSSHKeyName(r.Spec.Template.Spec.SSHKeyName)

api/v1beta2/conditions_consts.go

@@ -148,7 +148,7 @@ const (
 
 	// DedicatedHostReleaseCondition reports on the status of dedicated host release operations.
 	// This condition tracks whether the dedicated host has been successfully released or if there are failures.
-	DedicatedHostReleaseCondition clusterv1.ConditionType = "DedicatedHostRelease"
+	DedicatedHostReleaseCondition clusterv1beta1.ConditionType = "DedicatedHostRelease"
 
 	// InstanceNotFoundReason used when the instance couldn't be retrieved.
 	InstanceNotFoundReason = "InstanceNotFound"

controllers/awsmachine_controller.go

@@ -372,7 +372,7 @@ func (r *AWSMachineReconciler) reconcileDelete(ctx context.Context, machineScope
 			machineScope.Info("Releasing dynamically allocated dedicated host", "hostID", hostID)
 			if err := ec2Service.ReleaseDedicatedHost(ctx, hostID); err != nil {
 				machineScope.Error(err, "failed to release dedicated host", "hostID", hostID)
-				conditions.MarkFalse(machineScope.AWSMachine, infrav1.DedicatedHostReleaseCondition, infrav1.DedicatedHostReleaseFailedReason, clusterv1.ConditionSeverityError, "%s", err.Error())
+				v1beta1conditions.MarkFalse(machineScope.AWSMachine, infrav1.DedicatedHostReleaseCondition, infrav1.DedicatedHostReleaseFailedReason, clusterv1beta1.ConditionSeverityError, "%s", err.Error())
 				r.Recorder.Eventf(machineScope.AWSMachine, corev1.EventTypeWarning, "FailedReleaseHost", "Failed to release dedicated host %s: %v", hostID, err)
 				return ctrl.Result{}, err
 			}
@@ -382,7 +382,7 @@ func (r *AWSMachineReconciler) reconcileDelete(ctx context.Context, machineScope
 			r.Recorder.Eventf(machineScope.AWSMachine, corev1.EventTypeNormal, "SuccessfulReleaseHost", "Released dedicated host %s", hostID)
 
 			// Mark the condition as succeeded
-			conditions.MarkTrue(machineScope.AWSMachine, infrav1.DedicatedHostReleaseCondition)
+			v1beta1conditions.MarkTrue(machineScope.AWSMachine, infrav1.DedicatedHostReleaseCondition)
 
 			// Patch the object to persist success state
 			if err := machineScope.PatchObject(); err != nil {

go.mod

@@ -48,8 +48,8 @@ require (
 	github.com/sergi/go-diff v1.3.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.9.1
-	github.com/stretchr/testify v1.10.0
 	github.com/spf13/pflag v1.0.10
+	github.com/stretchr/testify v1.11.1
 	github.com/zgalor/weberr v0.8.2
 	go.uber.org/mock v0.5.2
 	golang.org/x/crypto v0.43.0