Remove unnecessary log

Author: lubronzhan

internal/controllers/machinedeployment/machinedeployment_rolling.go

@@ -179,11 +179,9 @@ func (r *Reconciler) reconcileOldMachineSets(ctx context.Context, allMSs []*clus
 
 	log.V(4).Info("Cleaned up unhealthy replicas from old MachineSets", "count", cleanupCount)
 
-	log.V(4).Info("Ensure old MachineSet has deletion related timeouts propagated from MachineDeployment")
 	if err := r.patchOldMSDeletionTimeoutsFromMD(ctx, oldMSs, deployment); err != nil {
 		return err
 	}
-	log.V(4).Info("Ensured old MachineSet has deletion related timeouts propagated from MachineDeployment")
 
 	// Scale down old MachineSets, need check maxUnavailable to ensure we can scale down
 	allMSs = oldMSs

internal/controllers/machinedeployment/machinedeployment_rollout_ondelete.go

@@ -104,15 +104,14 @@ func (r *Reconciler) reconcileOldMachineSetsOnDelete(ctx context.Context, oldMSs
 				return err
 			}
 		}
+		if err := r.patchOldMSDeletionTimeoutsFromMD(ctx, oldMSs, deployment); err != nil {
+			return err
+		}
 		selectorMap, err := metav1.LabelSelectorAsMap(&oldMS.Spec.Selector)
 		if err != nil {
 			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")
-		if err := r.patchOldMSDeletionTimeoutsFromMD(ctx, oldMSs, deployment); err != nil {
-			return err
-		}
 		log.V(4).Info("Fetching Machines associated with MachineSet")
 		// Get all Machines linked to this MachineSet.
 		allMachinesInOldMS := &clusterv1.MachineList{}

internal/controllers/machinedeployment/machinedeployment_sync.go

@@ -671,7 +671,6 @@ func (r *Reconciler) cleanupDeployment(ctx context.Context, oldMSs []*clusterv1.
 }
 
 func (r *Reconciler) patchOldMSDeletionTimeoutsFromMD(ctx context.Context, oldMSs []*clusterv1.MachineSet, deployment *clusterv1.MachineDeployment) error {
-	log := ctrl.LoggerFrom(ctx)
 	for _, oldMS := range oldMSs {
 		patchHelper, err := patch.NewHelper(oldMS, r.Client)
 		if err != nil {
@@ -685,7 +684,6 @@ func (r *Reconciler) patchOldMSDeletionTimeoutsFromMD(ctx context.Context, oldMS
 
 		err = patchHelper.Patch(ctx, oldMS)
 		if err != nil {
-			log.Error(err, "Failed to update MachineSet", "MachineSet", klog.KObj(oldMS))
 			return errors.Wrapf(err, "failed to update MachineSet %q", klog.KObj(oldMS))
 		}
 	}