Skip to content

Commit 8865a3a

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #15880 from sjenning/pick-46236
Automatic merge from submit-queue UPSTREAM: 46236: Support sandbox images from private registries kubernetes/kubernetes#46236 xref https://bugzilla.redhat.com/show_bug.cgi?id=1316341 This is a regression vs origin 1.5. When using the dockershim+CRI, the new default in kube 1.6, the client no longer uses `.docker/config.json` for pull credentials for infra pods. This upstream commit went into kube 1.7 but was not cherry-picked to kube 1.6. This PR is the pick for origin 1.6 and should try to go into 1.6.1 Reviewer note: Upstream refactored `dockertools` to `libdocker` so the patch doesn't match exactly. @sdodson @michaelgugino @derekwaynecarr @eparis
2 parents 2a858d5 + 6fb49e5 commit 8865a3a

File tree

3 files changed

+116
-9
lines changed

3 files changed

+116
-9
lines changed

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/helpers.go

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

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/helpers_test.go

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

‎vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/fake_docker_client.go

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

0 commit comments

Comments
 (0)