From 0c664a343c6a41349722a66ff3ff725e8519d2cd Mon Sep 17 00:00:00 2001
From: Victor Marmol <vmarmol@google.com>
Date: Tue, 17 Mar 2015 15:55:25 -0700
Subject: [PATCH] Adding errors to Kubelet events.

This will help while debugging issues that generate events.

Also removed unecessary log line.
---
 pkg/kubelet/dockertools/docker.go | 1 -
 pkg/kubelet/kubelet.go            | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go
index 0ccd72e73df..99da3ad0aeb 100644
--- a/pkg/kubelet/dockertools/docker.go
+++ b/pkg/kubelet/dockertools/docker.go
@@ -349,7 +349,6 @@ func (p dockerPuller) Pull(image string) error {
 	}
 	// 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.
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 94746fa67e9..046a64de221 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -1059,7 +1059,7 @@ func (kl *Kubelet) createPodInfraContainer(pod *api.Pod) (dockertools.DockerID,
 	ok, err := kl.dockerPuller.IsImagePresent(container.Image)
 	if err != nil {
 		if ref != nil {
-			kl.recorder.Eventf(ref, "failed", "Failed to inspect image %q", container.Image)
+			kl.recorder.Eventf(ref, "failed", "Failed to inspect image %q: %v", container.Image, err)
 		}
 		return "", err
 	}
@@ -1099,7 +1099,7 @@ func (kl *Kubelet) pullImage(img string, ref *api.ObjectReference) error {
 
 	if err := kl.dockerPuller.Pull(img); err != nil {
 		if ref != nil {
-			kl.recorder.Eventf(ref, "failed", "Failed to pull image %q", img)
+			kl.recorder.Eventf(ref, "failed", "Failed to pull image %q: %v", img, err)
 		}
 		return err
 	}
@@ -1215,7 +1215,7 @@ func (kl *Kubelet) pullImageAndRunContainer(pod *api.Pod, container *api.Contain
 		present, err := kl.dockerPuller.IsImagePresent(container.Image)
 		if err != nil {
 			if ref != nil {
-				kl.recorder.Eventf(ref, "failed", "Failed to inspect image %q", container.Image)
+				kl.recorder.Eventf(ref, "failed", "Failed to inspect image %q: %v", container.Image, err)
 			}
 			glog.Errorf("Failed to inspect image %q: %v; skipping pod %q container %q", container.Image, err, podFullName, container.Name)
 			return "", err