From 0532c462172e850bfc09a679ef119b85c264d425 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Tue, 10 Feb 2015 07:23:32 -0800
Subject: [PATCH] Add a more detailed error message for potential auth fails in
 docker pull.

---
 pkg/credentialprovider/keyring.go      |  9 +++++++++
 pkg/kubelet/dockertools/docker.go      | 16 +++++++++++++++-
 pkg/kubelet/dockertools/docker_test.go | 21 +++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/pkg/credentialprovider/keyring.go b/pkg/credentialprovider/keyring.go
index 6132c04bfa..aa9ebbf82b 100644
--- a/pkg/credentialprovider/keyring.go
+++ b/pkg/credentialprovider/keyring.go
@@ -143,3 +143,12 @@ func (dk *lazyDockerKeyring) Lookup(image string) (docker.AuthConfiguration, boo
 
 	return keyring.Lookup(image)
 }
+
+type FakeKeyring struct {
+	auth docker.AuthConfiguration
+	ok   bool
+}
+
+func (f *FakeKeyring) Lookup(image string) (docker.AuthConfiguration, bool) {
+	return f.auth, f.ok
+}
diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go
index bbe6b86f0b..060a39bfe6 100644
--- a/pkg/kubelet/dockertools/docker.go
+++ b/pkg/kubelet/dockertools/docker.go
@@ -222,7 +222,21 @@ func (p dockerPuller) Pull(image string) error {
 		glog.V(1).Infof("Pulling image %s without credentials", image)
 	}
 
-	return p.client.PullImage(opts, creds)
+	err := p.client.PullImage(opts, creds)
+	// If there was no error, or we had credentials, just return the error.
+	if err == nil || ok {
+		return err
+	}
+	// Image spec: [<registry>/]<repository>/<image>[:<version] so we count '/'
+	explicitRegistry := (strings.Count(image, "/") == 2)
+	glog.Errorf("Foo: %s", explicitRegistry)
+	// Hack, look for a private registry, and decorate the error with the lack of
+	// credentials.  This is heuristic, and really probably could be done better
+	// by talking to the registry API directly from the kubelet here.
+	if explicitRegistry {
+		return fmt.Errorf("image pull failed for %s, this may be because there are no credentials on this request.  details: (%v)", image, err)
+	}
+	return err
 }
 
 func (p throttledDockerPuller) Pull(image string) error {
diff --git a/pkg/kubelet/dockertools/docker_test.go b/pkg/kubelet/dockertools/docker_test.go
index 2402d25c5a..22c50354cf 100644
--- a/pkg/kubelet/dockertools/docker_test.go
+++ b/pkg/kubelet/dockertools/docker_test.go
@@ -196,6 +196,27 @@ func TestParseImageName(t *testing.T) {
 	}
 }
 
+func TestDockerKeyringLookupFails(t *testing.T) {
+	fakeKeyring := &credentialprovider.FakeKeyring{}
+	fakeClient := &FakeDockerClient{
+		Err: fmt.Errorf("test error"),
+	}
+
+	dp := dockerPuller{
+		client:  fakeClient,
+		keyring: fakeKeyring,
+	}
+
+	err := dp.Pull("host/repository/image:version")
+	if err == nil {
+		t.Errorf("unexpected non-error")
+	}
+	msg := "image pull failed for host/repository/image, this may be because there are no credentials on this request.  details: (test error)"
+	if err.Error() != msg {
+		t.Errorf("expected: %s, saw: %s", msg, err.Error())
+	}
+}
+
 func TestDockerKeyringLookup(t *testing.T) {
 	empty := docker.AuthConfiguration{}