Merge pull request kubernetes#78261 from tallclair/imageref

k8s-ci-robot · web-flow · commit 78254d555a29 · 2019-05-23T19:30:32.000-07:00
Revert kubernetes#76665: "Use consistent imageRef during container startup"
diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go
@@ -194,7 +194,7 @@ func (m *kubeGenericRuntimeManager) generateContainerConfig(container *v1.Contai
 		return nil, nil, err
 	}
 
-	uid, username, err := m.getImageUser(imageRef)
+	uid, username, err := m.getImageUser(container.Image)
 	if err != nil {
 		return nil, cleanupAction, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ func (m kubeGenericRuntimeManager) generateContainerConfig(container v1.Contai`
`194`	`194`	`return nil, nil, err`
`195`	`195`	`}`
`196`	`196`
`197`		`- uid, username, err := m.getImageUser(imageRef)`
	`197`	`+ uid, username, err := m.getImageUser(container.Image)`
`198`	`198`	`if err != nil {`
`199`	`199`	`return nil, cleanupAction, err`
`200`	`200`	`}`