Merge pull request #2513 from lavalamp/verifyNetwork

Fix crash (loop?) in kubelet
This commit is contained in:
bgrant0607 2014-11-21 10:10:32 -08:00
commit 9f5ebef3d8

View File

@ -311,6 +311,9 @@ func GetRecentDockerContainersWithNameAndUUID(client DockerInterface, podFullNam
return nil, err return nil, err
} }
for _, dockerContainer := range containers { for _, dockerContainer := range containers {
if len(dockerContainer.Names) == 0 {
continue
}
dockerPodName, dockerUUID, dockerContainerName, _ := ParseDockerName(dockerContainer.Names[0]) dockerPodName, dockerUUID, dockerContainerName, _ := ParseDockerName(dockerContainer.Names[0])
if dockerPodName != podFullName { if dockerPodName != podFullName {
continue continue