github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76059 from tedyu/master

Browse Source 
Remove unnecessary map in cleanupHistory
This commit is contained in:
Kubernetes Prow Robot 2019-06-25 05:24:35 -07:00 committed by GitHub
commit a78ae4ba74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/daemon/update.go
View File

@ -160,21 +160,13 @@ func (dsc *DaemonSetsController) cleanupHistory(ds *apps.DaemonSet, old []*apps.
} }
} }
// Find all live history with the above hashes
liveHistory := make(map[string]bool)
for _, history := range old {
if hash := history.Labels[apps.DefaultDaemonSetUniqueLabelKey]; liveHashes[hash] {
liveHistory[history.Name] = true
}
}
// Clean up old history from smallest to highest revision (from oldest to newest) // Clean up old history from smallest to highest revision (from oldest to newest)
sort.Sort(historiesByRevision(old)) sort.Sort(historiesByRevision(old))
for _, history := range old { for _, history := range old {
if toKill <= 0 { if toKill <= 0 {
break break
} }
if liveHistory[history.Name] { if hash := history.Labels[apps.DefaultDaemonSetUniqueLabelKey]; liveHashes[hash] {
continue continue
} }
// Clean up // Clean up