Merge pull request kubernetes#93124 from gaurav1086/InjectImageInspects_fix_range_issue

k8s-ci-robot · web-flow · commit 0decea31a1f9 · 2020-08-29T20:04:21.000-07:00
[kubelet/dockershim] : fix range iterator copy issue in InjectImageInspects
diff --git a/pkg/kubelet/dockershim/libdocker/fake_client.go b/pkg/kubelet/dockershim/libdocker/fake_client.go
@@ -735,9 +735,10 @@ func (f *FakeDockerClient) ResetImages() {
 func (f *FakeDockerClient) InjectImageInspects(inspects []dockertypes.ImageInspect) {
 	f.Lock()
 	defer f.Unlock()
-	for _, i := range inspects {
-		f.Images = append(f.Images, *createImageFromImageInspect(i))
-		f.ImageInspects[i.ID] = &i
+	for i := range inspects {
+		inspect := inspects[i]
+		f.Images = append(f.Images, *createImageFromImageInspect(inspect))
+		f.ImageInspects[inspect.ID] = &inspect
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -735,9 +735,10 @@ func (f *FakeDockerClient) ResetImages() {`
`735`	`735`	`func (f *FakeDockerClient) InjectImageInspects(inspects []dockertypes.ImageInspect) {`
`736`	`736`	`f.Lock()`
`737`	`737`	`defer f.Unlock()`
`738`		`- for _, i := range inspects {`
`739`		`- f.Images = append(f.Images, *createImageFromImageInspect(i))`
`740`		`- f.ImageInspects[i.ID] = &i`
	`738`	`+ for i := range inspects {`
	`739`	`+ inspect := inspects[i]`
	`740`	`+ f.Images = append(f.Images, *createImageFromImageInspect(inspect))`
	`741`	`+ f.ImageInspects[inspect.ID] = &inspect`
`741`	`742`	`}`
`742`	`743`	`}`
`743`	`744`