From c9f58c0cd5c8dcaac03cb28e976c7acc253c0606 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Wed, 17 May 2017 12:58:41 -0700 Subject: [PATCH] dont return nil quantities when calling deleteImages, as this quantity is used regardless of err --- pkg/kubelet/eviction/helpers.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/kubelet/eviction/helpers.go b/pkg/kubelet/eviction/helpers.go index 2a36d8c81d5..72aa9d30b4f 100644 --- a/pkg/kubelet/eviction/helpers.go +++ b/pkg/kubelet/eviction/helpers.go @@ -1001,13 +1001,10 @@ func deleteImages(imageGC ImageGC, reportBytesFreed bool) nodeReclaimFunc { return func() (*resource.Quantity, error) { glog.Infof("eviction manager: attempting to delete unused images") bytesFreed, err := imageGC.DeleteUnusedImages() - if err != nil { - return nil, err - } reclaimed := int64(0) if reportBytesFreed { reclaimed = bytesFreed } - return resource.NewQuantity(reclaimed, resource.BinarySI), nil + return resource.NewQuantity(reclaimed, resource.BinarySI), err } }