github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 13:42:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1335 from dchen1107/exit1

Browse Source 
Convert existing kubernetes system to use ContainerStatus, instead of
This commit is contained in:
Brendan Burns
2014-09-24 21:37:24 -07:00
parent a981ae5480 96686b3692
commit 431caa93df
13 changed files with 93 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/handlers.go
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.NetworkSettings != nil {
host = netInfo.NetworkSettings.IPAddress
if found && netInfo.DetailInfo.NetworkSettings != nil {
host = netInfo.DetailInfo.NetworkSettings.IPAddress
} else {
return fmt.Errorf("failed to find networking container: %v", info)
}