From 93487867ac50f69f1cd6a71a420b86c012d72a47 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Fri, 27 May 2016 10:15:16 -0700 Subject: [PATCH] kubenet: Update empty ip check The previous check was incorrect because the `IP.String` method returns `` and other non-empty-strings on error conditions. --- pkg/kubelet/network/kubenet/kubenet_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/network/kubenet/kubenet_linux.go b/pkg/kubelet/network/kubenet/kubenet_linux.go index c4fa04dad1..9ff155b2df 100644 --- a/pkg/kubelet/network/kubenet/kubenet_linux.go +++ b/pkg/kubelet/network/kubenet/kubenet_linux.go @@ -317,7 +317,7 @@ func (plugin *kubenetNetworkPlugin) SetUpPod(namespace string, name string, id k if err != nil { return err } - if res.IP4 == nil || res.IP4.IP.IP.String() == "" { + if res.IP4 == nil || len(res.IP4.IP.IP) != net.IPv4len { return fmt.Errorf("CNI plugin reported no IPv4 address for container %v.", id) } plugin.podIPs[id] = res.IP4.IP.IP.String()