Commit d91de34

openshift-merge-robot

authored

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

2 parents db03c49 + 6f93cc5 commit d91de34Copy full SHA for d91de34

2 files changed

+8

-7

lines changed

vendor/k8s.io/kubernetes/pkg/kubelet/images
- image_manager.go
- image_manager_test.go

2 files changed

+8

-7

lines changed

`‎vendor/k8s.io/kubernetes/pkg/kubelet/images/image_manager.go`

+6-5

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎vendor/k8s.io/kubernetes/pkg/kubelet/images/image_manager_test.go`

+2-2

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)