Fix e2e tests.

hack/e2e-suite/basic.sh

@@ -50,7 +50,7 @@ while [ $ALL_RUNNING -ne 1 ]; do
   ALL_RUNNING=1
   for id in $POD_ID_LIST; do
     CURRENT_STATUS=$($KUBECFG -template '{{and .CurrentState.Info.mynginx.State.Running .CurrentState.Info.net.State.Running}}' get pods/$id)
-    if [ "$CURRENT_STATUS" != "{}" ]; then
+    if [ "$CURRENT_STATUS" != "{0001-01-01 00:00:00 +0000 UTC}" ]; then
       ALL_RUNNING=0
     fi
   done

hack/e2e-suite/update.sh

@@ -47,12 +47,12 @@ function validate() {
       local template_string current_status current_image host_ip
       template_string="{{and ((index .CurrentState.Info \"${CONTROLLER_NAME}\").State.Running) .CurrentState.Info.net.State.Running}}"
       current_status=$($KUBECFG -template="${template_string}" get "pods/$id")
-      if [[ "$current_status" != "{}" ]]; then
+      if [ "$current_status" != "{0001-01-01 00:00:00 +0000 UTC}" ]; then
         echo "  $id is created but not running"
         continue
       fi
 
-      template_string="{{(index .CurrentState.Info \"${CONTROLLER_NAME}\").DetailInfo.Config.Image}}"
+      template_string="{{(index .CurrentState.Info \"${CONTROLLER_NAME}\").Image}}"
       current_image=$($KUBECFG -template="${template_string}" get "pods/$id")
       if [[ "$current_image" != "${DOCKER_HUB_USER}/update-demo:${container_image_version}" ]]; then
         echo "  ${id} is created but running wrong image"

pkg/api/types.go

@@ -329,6 +329,8 @@ type ContainerStatus struct {
 	// TODO(dchen1107): Deprecated this soon once we pull entire PodStatus from node,
 	// not just PodInfo. Now we need this to remove docker.Container from API
 	PodIP string `json:"podIP,omitempty" yaml:"podIP,omitempty"`
+	// TODO(dchen1107): Need to decide how to reprensent this in v1beta3
+	Image string `yaml:"image" json:"image"`
 	// TODO(dchen1107): Once we have done with integration with cadvisor, resource
 	// usage should be included.
 }

pkg/api/v1beta1/types.go

@@ -314,6 +314,8 @@ type ContainerStatus struct {
 	// TODO(dchen1107): Deprecated this soon once we pull entire PodStatus from node,
 	// not just PodInfo. Now we need this to remove docker.Container from API
 	PodIP string `json:"podIP,omitempty" yaml:"podIP,omitempty"`
+	// TODO(dchen1107): Need to decide how to reprensent this in v1beta3
+	Image string `yaml:"image" json:"image"`
 	// TODO(dchen1107): Once we have done with integration with cadvisor, resource
 	// usage should be included.
 }

pkg/api/v1beta2/types.go

@@ -310,6 +310,8 @@ type ContainerStatus struct {
 	// TODO(dchen1107): Deprecated this soon once we pull entire PodStatus from node,
 	// not just PodInfo. Now we need this to remove docker.Container from API
 	PodIP string `json:"podIP,omitempty" yaml:"podIP,omitempty"`
+	// TODO(dchen1107): Need to decide how to reprensent this in v1beta3
+	Image string `yaml:"image" json:"image"`
 	// TODO(dchen1107): Once we have done with integration with cadvisor, resource
 	// usage should be included.
 }

pkg/api/v1beta3/types.go

@@ -338,6 +338,7 @@ type ContainerStatus struct {
 	State        ContainerState `json:"state,omitempty" yaml:"state,omitempty"`
 	RestartCount int            `json:"restartCount" yaml:"restartCount"`
 	// TODO(dchen1107): Introduce our own NetworkSettings struct here?
+	// TODO(dchen1107): Which image the container is running with?
 	// TODO(dchen1107): Once we have done with integration with cadvisor, resource
 	// usage should be included.
 }

pkg/kubelet/dockertools/docker.go

@@ -293,8 +293,9 @@ func inspectContainer(client DockerInterface, dockerID, containerName string) (*
 
 	glog.V(3).Infof("Container: %s [%s] inspect result %+v", *inspectResult)
 	var containerStatus api.ContainerStatus
-	waiting := true
+	containerStatus.Image = inspectResult.Config.Image
 
+	waiting := true
 	if inspectResult.State.Running {
 		containerStatus.State.Running = &api.ContainerStateRunning{
 			StartedAt: inspectResult.State.StartedAt,