Merge pull request #18341 from sjenning/pick-58955-3.8

Automatic merge from submit-queue. [3.8] UPSTREAM: 58955: pkg: kubelet: do not assume anything about images names 3.8 backport; see master PR #18340 for details. @liggitt @derekwaynecarr @frobware @mrunalp @runcom
openshift · Jan 31, 2018 · 8a1df81 · 8a1df81
2 parents 47a7399 + ed9b8b4
commit 8a1df81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/images/image_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/images/image_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/images/image_manager_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/images/image_manager_test.go