Merge pull request #43 from jschwinger233/zc/cni

enable cni for custom network by config

barrel.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path"
 	"strings"
 	"time"
 
@@ -101,8 +100,8 @@ func main() {
 	}
 
 	var app *cli.App
-	switch path.Base(os.Args[0]) {
-	case "barrel-cni":
+	switch {
+	case strings.HasSuffix(os.Args[0], "barrel-cni"):
 		store, err := filesystem.NewStore("/var/lib/barrel/cni")
 		if err != nil {
 			log.Fatalf("failed to new store: %+v", err)

cni/subhandler/base.go

@@ -27,6 +27,11 @@ func NewBase(conf config.Config, store store.Store) *Base {
 	}
 }
 
+// Enabled .
+func (h *Base) Enabled() bool {
+	return h.conf != config.Config{}
+}
+
 // BorrowNetEndpoint will snatch the nep
 func (h *Base) BorrowNetEndpoint(containerMeta *cni.ContainerMeta, nep *cni.NetEndpoint) (err error) {
 	if err = h.store.OccupyNetEndpoint(containerMeta.ID(), nep); err != nil {