github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67638 from houjun41544/20180821

Browse Source 
Fix fmt.Errorf messages
This commit is contained in:
Kubernetes Prow Robot 2019-02-08 13:13:49 -08:00 committed by GitHub
commit 52b3956df4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/volume/expand/cache/volume_resize_map.go vendored
View File

@ -185,7 +185,7 @@ func (resizeMap *volumeResizeMap) UpdatePVSize(pvcr *PVCWithResizeRequest, newSi
oldData, err := json.Marshal(pvClone) oldData, err := json.Marshal(pvClone)
if err != nil { 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 pvClone.Spec.Capacity[v1.ResourceStorage] = newSize
@ -193,13 +193,13 @@ func (resizeMap *volumeResizeMap) UpdatePVSize(pvcr *PVCWithResizeRequest, newSi
newData, err := json.Marshal(pvClone) newData, err := json.Marshal(pvClone)
if err != nil { 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) patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, pvClone)
if err != nil { 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) _, updateErr := resizeMap.kubeClient.CoreV1().PersistentVolumes().Patch(pvClone.Name, commontypes.StrategicMergePatchType, patchBytes)