github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #60448 from Random-Liu/image-cache-return-copy

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 59365, 60446, 60448, 55019, 60431). 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>.

Let image manager return a copy of image list.

Fixes https://github.com/kubernetes/kubernetes/issues/60443.
/cc @kubernetes/sig-node-pr-reviews 

**Release note**:

```release-note
none
```
This commit is contained in:
Kubernetes Submit Queue 2018-02-27 10:50:41 -08:00 committed by GitHub
commit c7b3e163d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/images/image_gc_manager.go
View File

@ -124,7 +124,7 @@ func (i *imageCache) set(images []container.Image) {
func (i *imageCache) get() []container.Image { func (i *imageCache) get() []container.Image {
i.RLock() i.RLock()
defer i.RUnlock() defer i.RUnlock()
return i.images return append([]container.Image{}, i.images...)
} }
// Information about the images we track. // Information about the images we track.

10
pkg/kubelet/images/image_gc_manager_test.go
View File

@ -548,6 +548,16 @@ func TestValidateImageGCPolicy(t *testing.T) {
} }
} }
func TestImageCacheReturnCopiedList(t *testing.T) {
cache := &imageCache{}
testList := []container.Image{{ID: "1"}, {ID: "2"}}
cache.set(testList)
list := cache.get()
assert.Len(t, list, 2)
list[0].ID = "3"
assert.Equal(t, cache.get(), testList)
}
func uint64Ptr(i uint64) *uint64 { func uint64Ptr(i uint64) *uint64 {
return &i return &i
} }