Merge pull request #453 from mogren/master

No pods is not an error
aws · May 7, 2019 · 3460788 · 3460788
2 parents 6fe1ecf + a5caa53
commit 3460788
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ipamd/ipamd.go b/ipamd/ipamd.go
@@ -315,12 +315,16 @@ func (c *IPAMContext) getLocalPodsWithRetry() ([]*k8sapi.K8SPodInfo, error) {
 		time.Sleep(retryK8SInterval)
 	}
 
+	if err != nil {
+		return nil, err
+	}
+
 	if pods == nil {
-		return nil, errors.New("unable to get local pods, giving up")
+		log.Info("No pods found on this node")
+		return pods, nil
 	}
 
 	var containers map[string]*docker.ContainerInfo
-
 	for retry := 1; retry <= maxK8SRetries; retry++ {
 		containers, err = c.dockerClient.GetRunningContainers()
 		if err == nil {