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
openshift · Aug 24, 2017 · 8865a3a · 8865a3a
2 parents 2a858d5 + 6fb49e5
commit 8865a3a
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 9 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/helpers.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/helpers.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/helpers_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockershim/helpers_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/fake_docker_client.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/fake_docker_client.go