From aef797b70c6e12a9210619aded65eb44e9d4eda7 Mon Sep 17 00:00:00 2001 From: houjun Date: Tue, 21 Aug 2018 15:25:33 +0800 Subject: [PATCH] Fix fmt.Errorf messages --- pkg/controller/volume/expand/cache/volume_resize_map.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controller/volume/expand/cache/volume_resize_map.go b/pkg/controller/volume/expand/cache/volume_resize_map.go index d5392c1b65a..883fa7e562a 100644 --- a/pkg/controller/volume/expand/cache/volume_resize_map.go +++ b/pkg/controller/volume/expand/cache/volume_resize_map.go @@ -185,7 +185,7 @@ func (resizeMap *volumeResizeMap) UpdatePVSize(pvcr *PVCWithResizeRequest, newSi oldData, err := json.Marshal(pvClone) if err != nil { - return fmt.Errorf("Unexpected error marshaling PV : %q with error %v", pvClone.Name, err) + return fmt.Errorf("Unexpected error marshaling old PV %q with error : %v", pvClone.Name, err) } pvClone.Spec.Capacity[v1.ResourceStorage] = newSize @@ -193,13 +193,13 @@ func (resizeMap *volumeResizeMap) UpdatePVSize(pvcr *PVCWithResizeRequest, newSi newData, err := json.Marshal(pvClone) if err != nil { - return fmt.Errorf("Unexpected error marshaling PV : %q with error %v", pvClone.Name, err) + return fmt.Errorf("Unexpected error marshaling new PV %q with error : %v", pvClone.Name, err) } patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, pvClone) if err != nil { - return fmt.Errorf("Error Creating two way merge patch for PV : %q with error %v", pvClone.Name, err) + return fmt.Errorf("Error Creating two way merge patch for PV %q with error : %v", pvClone.Name, err) } _, updateErr := resizeMap.kubeClient.CoreV1().PersistentVolumes().Patch(pvClone.Name, commontypes.StrategicMergePatchType, patchBytes)