Revert "Revert "Add an api object for the kubelet, and a versioned endpoint.""

This reverts commit dcfcf315e5.
2014-12-15 09:29:04 -08:00
parent 1abc3e423c
commit a6f967b6e7
16 changed files with 122 additions and 44 deletions
--- a/pkg/registry/pod/rest.go
+++ b/pkg/registry/pod/rest.go
@@ -230,8 +230,8 @@ func (rs *REST) fillPodInfo(pod *api.Pod) {
 				return
 			}
 		}
-		pod.Status.Info = info
-		netContainerInfo, ok := info["net"]
+		pod.Status.Info = info.ContainerInfo
+		netContainerInfo, ok := pod.Status.Info["net"]
 		if ok {
 			if netContainerInfo.PodIP != "" {
 				pod.Status.PodIP = netContainerInfo.PodIP