Merge pull request #25071 from zhouhaibing089/clock-fix

allow equality to avoid flaky on clock

Merge pull request #25071 from zhouhaibing089/clock-fix
d9a4e9b4 · Robert Bailey · bb08b27e · 67747ca0 · d9a4e9b4
Commit d9a4e9b4 authored May 06, 2016 by Robert Bailey
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

image_manager.go pkg/kubelet/image_manager.go +1 -1

No files found.
--- a/pkg/kubelet/image_manager.go
+++ b/pkg/kubelet/image_manager.go
@@ -267,7 +267,7 @@ func (im *realImageManager) freeSpace(bytesToFree int64, freeTime time.Time) (in
 	spaceFreed := int64(0)
 	for _, image := range images {
 		// Images that are currently in used were given a newer lastUsed.
-		if image.lastUsed.After(freeTime) {
+		if image.lastUsed.Equal(freeTime) || image.lastUsed.After(freeTime) {
 			break
 		}