support fixed ip for container without label (#3)

Co-authored-by: nyanpassu <nyanpassu@outlook.com>

install.sh

@@ -1,4 +1,51 @@
-cp --parents /eru/minions.conf /etc/
-cp eru-minions.service /usr/lib/systemd/system/
+#!/bin/bash
+declare -a FILES=( 
+  "minions.conf" "/etc/eru/"
+  "eru-minions" "/usr/bin/"
+  "eru-minions.service" "/usr/lib/systemd/system/"
+)
+
+clear_file () {
+  if [ -e "$1" ];
+  then
+    echo "remove $1"
+    rm $1
+  else
+    echo "$1 not exists"
+  fi  
+}
+
+copy_file () {
+  echo "copy $1 to $2"
+  cp $1 $2
+}
+
+if [ -d "/etc/eru" ];
+then
+  echo "/etc/eru exists"
+else 
+  echo "create /etc/eru"
+  mkdir -p /etc/eru
+fi
+
+echo "===stop service==="
+systemctl stop eru-minions.service
+systemctl disable eru-minions.service
+
+echo "===remove old files==="
+for i in $(eval echo "{0..$((${#FILES[@]} - 1))..2}") 
+do
+  clear_file "${FILES[$((i + 1))]}${FILES[${i}]}" 
+done
+
+echo "===copy new files==="
+for i in $(eval echo "{0..$((${#FILES[@]} - 1))..2}") 
+do
+  copy_file "${FILES[${i}]}" "${FILES[$((i + 1))]}"
+done
+
+echo "===start service==="
 systemctl enable eru-minions.service
-systemctl start eru-minions.service
+systemctl start eru-minions.service
+
+echo "===minions install success==="

internal/driver/network.go

@@ -553,15 +553,25 @@ func (d NetworkDriver) Join(request *network.JoinRequest) (*network.JoinResponse
 	return resp, nil
 }
 
+// Leave .
 func (d NetworkDriver) Leave(request *network.LeaveRequest) error {
 	logutils.JSONMessage("Leave response", request)
-	container, address, err := d.findDockerContainerByEndpointId(request.EndpointID)
-	if err != nil {
+	var (
+		container       dockerTypes.Container
+		address         string
+		shouldReserveIP bool
+		err             error
+	)
+	if container, address, err = d.findDockerContainerByEndpointId(request.EndpointID); err != nil {
 		return err
 	}
-	// reserve ip here by container label
-	if containerHasFixedIPLabel(container) {
-		if err := d.ripam.Reserve(address, container.ID); err != nil {
+	if shouldReserveIP, err = d.shouldReserveIP(container, address); err != nil {
+		// we move on when trying to find out whether should reserve by reserve request mark
+		log.Errorln(err)
+	}
+	if shouldReserveIP {
+		if err = d.ripam.Reserve(address, container.ID); err != nil {
+			// we move on when reserve is failed
 			log.Errorln(err)
 		}
 	}
@@ -570,6 +580,20 @@ func (d NetworkDriver) Leave(request *network.LeaveRequest) error {
 	return netns.RemoveVeth(caliName)
 }
 
+func (d NetworkDriver) shouldReserveIP(container dockerTypes.Container, address string) (shouldReserve bool, err error) {
+	// reserve ip here by container label
+	if containerHasFixedIPLabel(container) {
+		shouldReserve = true
+		return
+	}
+	// reserve ip here by reserve request mark
+	if shouldReserve, err = d.ripam.ConsumeRequestMarkIfPresent(address); err != nil {
+		// ensure shouldReserve is false here when err is not nil
+		shouldReserve = false
+	}
+	return
+}
+
 func (d NetworkDriver) DiscoverNew(request *network.DiscoveryNotification) error {
 	logutils.JSONMessage("DiscoverNew", request)
 	log.Debugln("DiscoverNew response JSON={}")

internal/driver/reservedip.go

@@ -18,6 +18,8 @@ type ReservedIPManager interface {
 	Reserve(ip string, containerID string) error
 	AquireIfReserved(ip string) (bool, error)
 	IsReserved(ip string) (bool, error)
+	// marked is not guaranteed to be false when err is not nil
+	ConsumeRequestMarkIfPresent(ip string) (marked bool, err error)
 }
 
 // NewReservedIPManager .
@@ -36,6 +38,11 @@ func (ripam reservedIPManager) IsReserved(ip string) (bool, error) {
 	return ripam.etcd.Get(&lib.ReservedIPAddress{Address: ip})
 }
 
+// IsRequested .
+func (ripam reservedIPManager) ConsumeRequestMarkIfPresent(ip string) (bool, error) {
+	return ripam.etcd.GetAndDelete(&lib.ReserveRequest{Address: ip})
+}
+
 // AquireIfReserved .
 func (ripam reservedIPManager) AquireIfReserved(ip string) (bool, error) {
 	log.Infof("AquireIPIfReserved ip = %s", ip)

lib/lib.go

@@ -13,6 +13,7 @@ import (
 // Client .
 type Client interface {
 	ReleaseReservedIPByTiedContainerIDIfIdle(containerID string) error
+	MarkReserveRequestForIP(ip string) error
 }
 
 type client struct {
@@ -58,3 +59,12 @@ func (client client) ReleaseReservedIPByTiedContainerIDIfIdle(containerID string
 
 	return nil
 }
+
+func (client client) MarkReserveRequestForIP(ip string) (err error) {
+	var reserved bool
+	request := ReservedIPAddress{Address: ip}
+	if reserved, err = client.etcd.Get(&request); reserved || err != nil {
+		return
+	}
+	return client.etcd.Put(&request)
+}

lib/reservereq.go

@@ -0,0 +1,38 @@
+package lib
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/coreos/etcd/mvcc/mvccpb"
+)
+
+// ReserveRequest .
+type ReserveRequest struct {
+	Address string
+	version int64
+}
+
+// Key .
+func (req *ReserveRequest) Key() string {
+	if req.Address == "" {
+		return ""
+	}
+	return fmt.Sprintf("/barrel/reservereq/%s", req.Address)
+}
+
+// Read .
+func (req *ReserveRequest) Read(ekv *mvccpb.KeyValue) error {
+	req.version = ekv.Version
+	return json.Unmarshal(ekv.Value, req)
+}
+
+// JSON .
+func (req *ReserveRequest) JSON() string {
+	return fmt.Sprintf(`{"Address":"%s"}`, req.Address)
+}
+
+// Version .
+func (req *ReserveRequest) Version() int64 {
+	return req.version
+}