ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

do not error if last_reserved_ip is missing for host local ipam

Browse Source 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2017-02-03 17:58:30 -05:00
parent c4271dba67
commit 474ba16901
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/ipam/host-local/backend/allocator/allocator.go
View File

@ -18,6 +18,7 @@ import (
"fmt" "fmt"
"log" "log"
"net" "net"
"os"
"github.com/containernetworking/cni/pkg/ip" "github.com/containernetworking/cni/pkg/ip"
"github.com/containernetworking/cni/pkg/types" "github.com/containernetworking/cni/pkg/types"
@ -253,7 +254,7 @@ func (a *IPAllocator) getSearchRange() (net.IP, net.IP) {
var endIP net.IP var endIP net.IP
startFromLastReservedIP := false startFromLastReservedIP := false
lastReservedIP, err := a.store.LastReservedIP() lastReservedIP, err := a.store.LastReservedIP()
if err != nil { if err != nil && !os.IsNotExist(err) {
log.Printf("Error retriving last reserved ip: %v", err) log.Printf("Error retriving last reserved ip: %v", err)
} else if lastReservedIP != nil { } else if lastReservedIP != nil {
subnet := net.IPNet{ subnet := net.IPNet{

3
plugins/ipam/host-local/backend/disk/backend.go
View File

@ -15,7 +15,6 @@
package disk package disk
import ( import (
"fmt"
"io/ioutil" "io/ioutil"
"net" "net"
"os" "os"
@ -85,7 +84,7 @@ func (s *Store) LastReservedIP() (net.IP, error) {
ipfile := filepath.Join(s.dataDir, lastIPFile) ipfile := filepath.Join(s.dataDir, lastIPFile)
data, err := ioutil.ReadFile(ipfile) data, err := ioutil.ReadFile(ipfile)
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to retrieve last reserved ip: %v", err) return nil, err
} }
return net.ParseIP(string(data)), nil return net.ParseIP(string(data)), nil
} }