Merge pull request #1335 from dchen1107/exit1

Convert existing kubernetes system to use ContainerStatus, instead of

pkg/kubelet/server_test.go

@@ -146,7 +146,11 @@ func TestContainers(t *testing.T) {
 
 func TestPodInfo(t *testing.T) {
 	fw := newServerTest()
-	expected := api.PodInfo{"goodpod": docker.Container{ID: "myContainerID"}}
+	expected := api.PodInfo{
+		"goodpod": api.ContainerStatus{
+			DetailInfo: docker.Container{ID: "myContainerID"},
+		},
+	}
 	fw.fakeKubelet.infoFunc = func(name string) (api.PodInfo, error) {
 		if name == "goodpod.etcd" {
 			return expected, nil