Skip to content

K
k3s
Unverified Commit fba4cf6f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #67334 from fqsghostcloud/indent-error-flow

Automatic merge from submit-queue (batch tested with PRs 67294, 67320, 67335, 67334, 67325). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. indent error flow
parents 2bfe7028 21f9ac0e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
pkg/kubelet/images/image_gc_manager.go
View file @ fba4cf6f
...@@ -401,9 +401,8 @@ func (ev byLastUsedAndDetected) Less(i, j int) bool { ...@@ -401,9 +401,8 @@ func (ev byLastUsedAndDetected) Less(i, j int) bool {
// Sort by last used, break ties by detected. // Sort by last used, break ties by detected.
if ev[i].lastUsed.Equal(ev[j].lastUsed) { if ev[i].lastUsed.Equal(ev[j].lastUsed) {
return ev[i].firstDetected.Before(ev[j].firstDetected) return ev[i].firstDetected.Before(ev[j].firstDetected)
} else {
return ev[i].lastUsed.Before(ev[j].lastUsed)
} }
return ev[i].lastUsed.Before(ev[j].lastUsed)
} }
func isImageUsed(imageID string, imagesInUse sets.String) bool { func isImageUsed(imageID string, imagesInUse sets.String) bool {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment