Initial support of propogating the termination reasons and image failure

to apiserver. Deprecated docker.Container from API completely.

Conflicts:
	pkg/api/types.go
	pkg/kubelet/kubelet.go
This commit is contained in:
Dawn Chen
2014-10-02 23:39:02 -07:00
parent ab6065944c
commit 9861eb7c8e
8 changed files with 142 additions and 58 deletions

View File

@@ -77,8 +77,8 @@ func (h *httpActionHandler) Run(podFullName, uuid string, container *api.Contain
return err
}
netInfo, found := info[networkContainerName]
if found && netInfo.DetailInfo.NetworkSettings != nil {
host = netInfo.DetailInfo.NetworkSettings.IPAddress
if found {
host = netInfo.PodIP
} else {
return fmt.Errorf("failed to find networking container: %v", info)
}