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

Restore check when getting container IP

Browse Source
This commit is contained in:
Alexander Brand 2016-10-25 11:49:05 -04:00 committed by Paulo Pires
parent 244152544c
commit 9ef35289e4
No known key found for this signature in database
GPG Key ID: F3F6ED5C522EAA71
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/dockertools/docker_manager.go
View File

@ -422,11 +422,13 @@ func (dm *DockerManager) inspectContainer(id string, podName, podNamespace strin
// Container that are running, restarting and paused // Container that are running, restarting and paused
status.State = kubecontainer.ContainerStateRunning status.State = kubecontainer.ContainerStateRunning
status.StartedAt = startedAt status.StartedAt = startedAt
ip, err = dm.determineContainerIP(podNamespace, podName, iResult) if containerProvidesPodIP(dockerName) {
// Kubelet doesn't handle the network error scenario ip, err = dm.determineContainerIP(podNamespace, podName, iResult)
if err != nil { // Kubelet doesn't handle the network error scenario
status.State = kubecontainer.ContainerStateUnknown if err != nil {
status.Message = fmt.Sprintf("Network error: %#v", err) status.State = kubecontainer.ContainerStateUnknown
status.Message = fmt.Sprintf("Network error: %#v", err)
}
} }
return &status, ip, nil return &status, ip, nil
} }