Eliminate printing to log in format '%+v'

Signed-off-by: Elena Gershkovich <[email protected]>

Author: ELENAGER

controllers/drcluster_controller.go

@@ -545,12 +545,12 @@ func (u *drclusterInstance) statusUpdate() error {
 			return fmt.Errorf("failed to update drCluster status (%s/%s)", u.object.Name, u.object.Namespace)
 		}
 
-		u.log.Info(fmt.Sprintf("Updated drCluster Status %+v", u.object.Status))
+		u.log.Info(fmt.Sprintf("Updated drCluster Status (%s/%s)", u.object.Name, u.object.Namespace))
 
 		return nil
 	}
 
-	u.log.Info(fmt.Sprintf("Nothing to update %+v", u.object.Status))
+	u.log.Info(fmt.Sprintf("Nothing to update (%s/%s)", u.object.Name, u.object.Namespace))
 
 	return nil
 }

controllers/drplacementcontrol.go

@@ -126,8 +126,8 @@ func (d *DRPCInstance) RunInitialDeployment() (bool, error) {
 		return !done, err
 	}
 
-	d.log.Info(fmt.Sprintf("Using homeCluster %s for initial deployment, Placement Decision %+v",
-		homeCluster, d.reconciler.getClusterDecision(d.userPlacement)))
+	d.log.Info(fmt.Sprintf("Using homeCluster %s for initial deployment",
+		homeCluster))
 
 	// Check if we already deployed in the homeCluster or elsewhere
 	deployed, clusterName := d.isDeployed(homeCluster)
@@ -804,7 +804,7 @@ func (d *DRPCInstance) RunRelocate() (bool, error) {
 	}
 
 	if d.getLastDRState() != rmn.Relocating && !d.validatePeerReady() {
-		return !done, fmt.Errorf("clean up secondaries is pending (%+v)", d.instance.Status.Conditions)
+		return !done, fmt.Errorf("clean up secondaries is pending, peer is not ready")
 	}
 
 	if curHomeCluster != "" && curHomeCluster != preferredCluster {
@@ -1102,7 +1102,7 @@ func (d *DRPCInstance) isVRGConditionMet(cluster string, conditionType string) b
 		return !ready
 	}
 
-	d.log.Info(fmt.Sprintf("VRG status condition: %+v", condition))
+	d.log.Info(fmt.Sprintf("VRG status condition: %s is %s", conditionType, condition.Status))
 
 	return condition.Status == metav1.ConditionTrue &&
 		condition.ObservedGeneration == vrg.Generation

controllers/drplacementcontrol_controller.go

@@ -1342,8 +1342,6 @@ func getPlacementRule(ctx context.Context, k8sclient client.Client,
 			log.Info("User PlacementRule replica count is not set to 1, reconciliation will only" +
 				" schedule it to a single cluster")
 		}
-
-		log.Info(fmt.Sprintf("PlacementRule Status is: (%+v)", usrPlRule.Status))
 	}
 
 	return usrPlRule, nil
@@ -1702,7 +1700,7 @@ func (r *DRPlacementControlReconciler) updateDRPCStatus(
 		return errorswrapper.Wrap(err, "failed to update DRPC status")
 	}
 
-	log.Info(fmt.Sprintf("Updated DRPC Status %+v", drpc.Status))
+	log.Info("Updated DRPC Status")
 
 	return nil
 }

controllers/drplacementcontrolvolsync.go

@@ -278,7 +278,7 @@ func (d *DRPCInstance) updateVRGSpec(clusterName string, tgtVRG *rmn.VolumeRepli
 		return fmt.Errorf("failed to update MW (%w)", err)
 	}
 
-	d.log.Info(fmt.Sprintf("Updated VRG running in cluster %s. VRG (%+v)", clusterName, vrg))
+	d.log.Info(fmt.Sprintf("Updated VRG running in cluster %s. VRG (%s)", clusterName, vrg.Name))
 
 	return nil
 }

controllers/util/mcv_util.go

@@ -322,8 +322,8 @@ func (m ManagedClusterViewGetterImpl) getOrCreateManagedClusterView(
 			return nil, errorswrapper.Wrap(err, "failed to get ManagedClusterView")
 		}
 
-		logger.Info(fmt.Sprintf("Creating ManagedClusterView %s with scope %+v",
-			key, viewscope))
+		logger.Info(fmt.Sprintf("Creating ManagedClusterView %s with scope %s",
+			key, viewscope.Name))
 
 		if err := m.Create(context.TODO(), mcv); err != nil {
 			return nil, errorswrapper.Wrap(err, "failed to create ManagedClusterView")
@@ -332,8 +332,8 @@ func (m ManagedClusterViewGetterImpl) getOrCreateManagedClusterView(
 
 	if mcv.Spec.Scope != viewscope {
 		// Expected once when uprading ramen if scope format or details have changed.
-		logger.Info(fmt.Sprintf("Updating ManagedClusterView %s scope %+v to %+v",
-			key, mcv.Spec.Scope, viewscope))
+		logger.Info(fmt.Sprintf("Updating ManagedClusterView %s scope %s to %s",
+			key, mcv.Spec.Scope.Name, viewscope.Name))
 
 		mcv.Spec.Scope = viewscope
 		if err := m.Update(context.TODO(), mcv); err != nil {

controllers/util/mw_util.go

@@ -118,9 +118,6 @@ func (mwu *MWUtil) CreateOrUpdateVRGManifestWork(
 	name, namespace, homeCluster string,
 	vrg rmn.VolumeReplicationGroup, annotations map[string]string,
 ) error {
-	mwu.Log.Info(fmt.Sprintf("Create or Update manifestwork %s:%s:%s:%+v",
-		name, namespace, homeCluster, vrg))
-
 	manifestWork, err := mwu.generateVRGManifestWork(name, namespace, homeCluster, vrg, annotations)
 	if err != nil {
 		return err
@@ -157,8 +154,6 @@ func (mwu *MWUtil) CreateOrUpdateMModeManifestWork(
 	name, cluster string,
 	mMode rmn.MaintenanceMode, annotations map[string]string,
 ) error {
-	mwu.Log.Info(fmt.Sprintf("Create or Update manifestwork %s:%s:%+v", name, cluster, mMode))
-
 	manifestWork, err := mwu.generateMModeManifestWork(name, cluster, mMode, annotations)
 	if err != nil {
 		return err
@@ -238,9 +233,6 @@ func (mwu *MWUtil) CreateOrUpdateNFManifestWork(
 	name, namespace, homeCluster string,
 	nf csiaddonsv1alpha1.NetworkFence, annotations map[string]string,
 ) error {
-	mwu.Log.Info(fmt.Sprintf("Create or Update manifestwork %s:%s:%s:%+v",
-		name, namespace, homeCluster, nf))
-
 	manifestWork, err := mwu.generateNFManifestWork(name, namespace, homeCluster, nf, annotations)
 	if err != nil {
 		return err

controllers/volumereplicationgroup_controller.go

@@ -1038,8 +1038,8 @@ func (v *VRGInstance) updateVRGStatus(result ctrl.Result) ctrl.Result {
 	if !reflect.DeepEqual(v.savedInstanceStatus, v.instance.Status) {
 		v.instance.Status.LastUpdateTime = metav1.Now()
 		if err := v.reconciler.Status().Update(v.ctx, v.instance); err != nil {
-			v.log.Info(fmt.Sprintf("Failed to update VRG status (%v/%+v)",
-				err, v.instance.Status))
+			v.log.Info(fmt.Sprintf("Failed to update VRG status (%v/%s)",
+				err, v.instance.Name))
 
 			result.Requeue = true
 

controllers/vrg_recipe.go

@@ -119,7 +119,7 @@ func RecipeParametersExpand(recipe *recipe.Recipe, parameters map[string][]strin
 
 	bytes, err := json.Marshal(*spec)
 	if err != nil {
-		return fmt.Errorf("recipe spec %+v json marshal error: %w", *spec, err)
+		return fmt.Errorf("recipe %s json marshal error: %w", recipe.GetName(), err)
 	}
 
 	s1 := string(bytes)