github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

dont return nil quantities when calling deleteImages, as this quantity is used regardless of err

Browse Source
This commit is contained in:
David Ashpole 2017-05-17 12:58:41 -07:00
parent ac62748480
commit c9f58c0cd5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/eviction/helpers.go
View File

@ -1001,13 +1001,10 @@ func deleteImages(imageGC ImageGC, reportBytesFreed bool) nodeReclaimFunc {
return func() (*resource.Quantity, error) { return func() (*resource.Quantity, error) {
glog.Infof("eviction manager: attempting to delete unused images") glog.Infof("eviction manager: attempting to delete unused images")
bytesFreed, err := imageGC.DeleteUnusedImages() bytesFreed, err := imageGC.DeleteUnusedImages()
if err != nil {
return nil, err
}
reclaimed := int64(0) reclaimed := int64(0)
if reportBytesFreed { if reportBytesFreed {
reclaimed = bytesFreed reclaimed = bytesFreed
} }
return resource.NewQuantity(reclaimed, resource.BinarySI), nil return resource.NewQuantity(reclaimed, resource.BinarySI), err
} }
} }