do not error if last_reserved_ip is missing for host local ipam

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

diff --git a/plugins/ipam/host-local/backend/allocator/allocator.go b/plugins/ipam/host-local/backend/allocator/allocator.go
index 5f93424..c3211fc 100644 (file)
--- a/plugins/ipam/host-local/backend/allocator/allocator.go
+++ b/plugins/ipam/host-local/backend/allocator/allocator.go
@@ -18,6 +18,7 @@ import (
        "fmt"
        "log"
        "net"
+       "os"
 
        "github.com/containernetworking/cni/pkg/ip"
        "github.com/containernetworking/cni/pkg/types"
@@ -253,7 +254,7 @@ func (a *IPAllocator) getSearchRange() (net.IP, net.IP) {
        var endIP net.IP
        startFromLastReservedIP := false
        lastReservedIP, err := a.store.LastReservedIP()
-       if err != nil {
+       if err != nil && !os.IsNotExist(err) {
                log.Printf("Error retriving last reserved ip: %v", err)
        } else if lastReservedIP != nil {
                subnet := net.IPNet{

diff --git a/plugins/ipam/host-local/backend/disk/backend.go b/plugins/ipam/host-local/backend/disk/backend.go
index 9c11699..183b76e 100644 (file)
--- a/plugins/ipam/host-local/backend/disk/backend.go
+++ b/plugins/ipam/host-local/backend/disk/backend.go
@@ -15,7 +15,6 @@
 package disk
 
 import (
-       "fmt"
        "io/ioutil"
        "net"
        "os"
@@ -85,7 +84,7 @@ func (s *Store) LastReservedIP() (net.IP, error) {
        ipfile := filepath.Join(s.dataDir, lastIPFile)
        data, err := ioutil.ReadFile(ipfile)
        if err != nil {
-               return nil, fmt.Errorf("Failed to retrieve last reserved ip: %v", err)
+               return nil, err
        }
        return net.ParseIP(string(data)), nil
 }