github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #78316 from tallclair/automated-cherry-pick-of-#78261-upstream-release-1.14 

Revert "Use consistent imageRef during container startup"
pull/564/head
Kubernetes Prow Robot 2019-05-31 01:42:29 -07:00 committed by GitHub
parent 801f4e7003 6c1b3b4f62
commit 02026415cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kuberuntime/kuberuntime_container.go
View File

@ -194,7 +194,7 @@ func (m *kubeGenericRuntimeManager) generateContainerConfig(container *v1.Contai
return nil, nil, err return nil, nil, err
} }
uid, username, err := m.getImageUser(imageRef) uid, username, err := m.getImageUser(container.Image)
if err != nil { if err != nil {
return nil, cleanupAction, err return nil, cleanupAction, err
} }