From 736c4ffb0b5da752efd22ada5350573e544847c9 Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Fri, 14 Nov 2014 11:34:41 -0800
Subject: [PATCH] more events from kublet

---
 pkg/kubelet/kubelet.go | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 3d2819bf690..ccea8bb6840 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -442,6 +442,11 @@ func (kl *Kubelet) getRef(id dockertools.DockerID) (ref *api.ObjectReference, ok
 
 // Run a single container from a pod. Returns the docker container ID
 func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, podVolumes volumeMap, netMode string) (id dockertools.DockerID, err error) {
+	ref, err := containerRef(pod, container)
+	if err != nil {
+		glog.Errorf("Couldn't make a ref to pod %v, container %v: '%v'", pod.Name, container.Name, err)
+	}
+
 	envVariables := makeEnvironmentVariables(container)
 	binds := makeBinds(pod, container, podVolumes)
 	exposedPorts, portBindings := makePortsAndBindings(container)
@@ -461,8 +466,18 @@ func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, pod
 	}
 	dockerContainer, err := kl.dockerClient.CreateContainer(opts)
 	if err != nil {
+		if ref != nil {
+			record.Eventf(ref, "failed", "failed",
+				"Failed to create docker container with error(%v)", err)
+		}
 		return "", err
 	}
+	// Remember this reference so we can report events about this container
+	if ref != nil {
+		kl.setRef(dockertools.DockerID(dockerContainer.ID), ref)
+		record.Eventf(ref, "waiting", "created", "Created with docker id %v", dockerContainer.ID)
+	}
+
 	if len(container.TerminationMessagePath) != 0 {
 		p := path.Join(kl.rootDirectory, pod.Name, container.Name)
 		if err := os.MkdirAll(p, 0750); err != nil {
@@ -491,14 +506,13 @@ func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, pod
 		Privileged:   privileged,
 	})
 	if err != nil {
+		if ref != nil {
+			record.Eventf(ref, "failed", "failed",
+				"Failed to start with docker id %v with error(%v)", dockerContainer.ID, err)
+		}
 		return "", err
 	}
-
-	if ref, err := containerRef(pod, container); err != nil {
-		glog.Errorf("Couldn't make a ref to pod %v, container %v: '%v'", pod.Name, container.Name, err)
-	} else {
-		// Remember this reference so we can report events about this container
-		kl.setRef(dockertools.DockerID(dockerContainer.ID), ref)
+	if ref != nil {
 		record.Eventf(ref, "running", "started", "Started with docker id %v", dockerContainer.ID)
 	}