From 474ba16901fd1ee277be6d3c3dbe87fe163917a5 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Fri, 3 Feb 2017 17:58:30 -0500 Subject: [PATCH] do not error if last_reserved_ip is missing for host local ipam Signed-off-by: Evan Hazlett --- plugins/ipam/host-local/backend/allocator/allocator.go | 3 ++- plugins/ipam/host-local/backend/disk/backend.go | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/ipam/host-local/backend/allocator/allocator.go b/plugins/ipam/host-local/backend/allocator/allocator.go index 5f934240..c3211fc2 100644 --- 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 9c116993..183b76ea 100644 --- 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 }