Commit 8a1df81

openshift-merge-robot

authored

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

2 parents 47a7399 + ed9b8b4 commit 8a1df81Copy full SHA for 8a1df81

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)