Resolve conversion test failure

Signed-off-by: Lubron Zhan <[email protected]>

Author: lubronzhan

api/v1beta1/conversion.go

@@ -574,7 +574,7 @@ func Convert_v1beta1_Condition_To_v1_Condition(_ *Condition, _ *metav1.Condition
 	return nil
 }
 
-// Convert_v1beta2_Topology_To_v1beta1_Topology is an autogenerated conversion function.
-func Convert_v1beta2_Topology_To_v1beta1_Topology(in *clusterv1.Topology, out *Topology, s apimachineryconversion.Scope) error {
-	return autoConvert_v1beta2_Topology_To_v1beta1_Topology(in, out, s)
+func Convert_v1beta2_Topology_To_v1beta1_Topology(_ *clusterv1.Topology, _ *Topology, _ apimachineryconversion.Scope) error {
+	// NOTE: v1beta2 conditions should not be automatically converted into legacy (v1beta1) conditions.
+	return nil
 }

internal/controllers/machine/machine_controller.go

@@ -715,7 +715,7 @@ func (r *Reconciler) nodeVolumeDetachTimeoutExceeded(machine *clusterv1.Machine)
 func (r *Reconciler) isDeleteNodeAllowed(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine) error {
 	log := ctrl.LoggerFrom(ctx)
 	// Return early if the cluster is being deleted and cluster's nodeDeletionStrategy is not set or set to `force`.
-	if !cluster.DeletionTimestamp.IsZero() && (cluster.Spec.Topology == nil || cluster.Spec.Topology.NodeDeletionStrategy == clusterv1.NodeDeletionStrategyForce) {
+	if !cluster.DeletionTimestamp.IsZero() && (cluster.Spec.Topology == nil || cluster.Spec.Topology.NodeDeletionStrategy != clusterv1.NodeDeletionStrategyGraceful) {
 		return errClusterIsBeingDeleted
 	}