Merge pull request #18340 from sjenning/pick-58955

Automatic merge from submit-queue (batch tested with PRs 18225, 18351, 18331, 18340, 18326). UPSTREAM: 58955: pkg: kubelet: do not assume anything about images names kubernetes/kubernetes#58955 removes the need for #18020 see history: kubernetes/kubernetes#51751 kubernetes/kubernetes#52110 kubernetes/kubernetes#53161 @liggitt @derekwaynecarr @frobware @mrunalp @runcom
openshift · Jan 31, 2018 · d91de34 · d91de34
2 parents db03c49 + 6f93cc5
commit d91de34
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