Merge pull request #2513 from lavalamp/verifyNetwork

Fix crash (loop?) in kubelet

Merge pull request #2513 from lavalamp/verifyNetwork
9f5ebef3 · bgrant0607 · ae1e386d · 9116c270 · 9f5ebef3
Commit 9f5ebef3 authored Nov 21, 2014 by bgrant0607
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

docker.go pkg/kubelet/dockertools/docker.go +3 -0

No files found.
--- a/pkg/kubelet/dockertools/docker.go
+++ b/pkg/kubelet/dockertools/docker.go
@@ -311,6 +311,9 @@ func GetRecentDockerContainersWithNameAndUUID(client DockerInterface, podFullNam
 		return nil, err
 	}
 	for _, dockerContainer := range containers {
+		if len(dockerContainer.Names) == 0 {
+			continue
+		}
 		dockerPodName, dockerUUID, dockerContainerName, _ := ParseDockerName(dockerContainer.Names[0])
 		if dockerPodName != podFullName {
 			continue