From 1d76452bc2287e0a0215305eaeecbb79b210ec58 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Thu, 6 Nov 2014 11:11:29 -0800 Subject: [PATCH] added support for authentication against the default docker registry when provided in the .dockercfg a --- pkg/kubelet/dockertools/docker.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go index cbff15f8114..fd67d7daca4 100644 --- a/pkg/kubelet/dockertools/docker.go +++ b/pkg/kubelet/dockertools/docker.go @@ -613,6 +613,8 @@ func (dk *dockerKeyring) reindex() { sort.Sort(sort.Reverse(sort.StringSlice(dk.index))) } +const defaultRegistryHost = "index.docker.io/v1/" + func (dk *dockerKeyring) lookup(image string) (docker.AuthConfiguration, bool) { // range over the index as iterating over a map does not provide // a predictable ordering @@ -624,6 +626,11 @@ func (dk *dockerKeyring) lookup(image string) (docker.AuthConfiguration, bool) { return dk.creds[k], true } + // use credentials for the default registry if provided + if auth, ok := dk.creds[defaultRegistryHost]; ok { + return auth, true + } + return docker.AuthConfiguration{}, false }