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

Convert existing kubernetes system to use ContainerStatus, instead of

Browse Source 
docker.Container directly.

Conflicts:
	pkg/kubelet/dockertools/docker.go
	pkg/registry/pod/rest.go
This commit is contained in:
Dawn Chen
2014-09-16 13:21:04 -07:00
parent 9564dacf6c
commit 0e6ec3cbfc
11 changed files with 92 additions and 55 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)
}