Propagate the deletion related timeout from MD to old MS when old MS is getting deleted

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

Author: lubronzhan

internal/controllers/machinedeployment/machinedeployment_rollout_ondelete.go

@@ -109,6 +109,10 @@ func (r *Reconciler) reconcileOldMachineSetsOnDelete(ctx context.Context, oldMSs
 			log.V(4).Info("Failed to convert MachineSet label selector to a map", "err", err)
 			continue
 		}
+		log.V(4).Info("Ensure old MachineSet has deletion related timeouts propagated from MachineDeployment")
+		oldMS.Spec.Template.Spec.NodeDrainTimeout = deployment.Spec.Template.Spec.NodeDrainTimeout
+		oldMS.Spec.Template.Spec.NodeDeletionTimeout = deployment.Spec.Template.Spec.NodeDeletionTimeout
+		oldMS.Spec.Template.Spec.NodeVolumeDetachTimeout = deployment.Spec.Template.Spec.NodeVolumeDetachTimeout
 		log.V(4).Info("Fetching Machines associated with MachineSet")
 		// Get all Machines linked to this MachineSet.
 		allMachinesInOldMS := &clusterv1.MachineList{}