Merge pull request #4 from spidernet-io/multu_nic

fix missing routes in multi-nic mode

pkg/config/config.go

@@ -3,14 +3,14 @@ package config
 import (
 	"encoding/json"
 	"fmt"
+	"net"
+	"regexp"
+	"strings"
+
 	"github.com/containernetworking/cni/pkg/version"
-	"github.com/spidernet-io/cni-plugins/pkg/constant"
 	"github.com/spidernet-io/plugins/pkg/logging"
 	"github.com/spidernet-io/plugins/pkg/types"
 	"k8s.io/utils/pointer"
-	"net"
-	"regexp"
-	"strings"
 )
 
 // ParseVethConfig parses the supplied configuration (and prevResult) from stdin.
@@ -36,7 +36,7 @@ func ParseVethConfig(stdin []byte) (*types.Veth, error) {
 
 	conf.LogOptions = logging.InitLogOptions(conf.LogOptions)
 	if conf.LogOptions.LogFilePath == "" {
-		conf.LogOptions.LogFilePath = constant.VethLogDefaultFilePath
+		conf.LogOptions.LogFilePath = types.VethLogDefaultFilePath
 	}
 
 	if conf.OnlyHardware {

pkg/networking/networking.go

@@ -2,6 +2,11 @@ package networking
 
 import (
 	"fmt"
+	"net"
+	"os"
+	"regexp"
+	"strings"
+
 	cnitypes "github.com/containernetworking/cni/pkg/types"
 	current "github.com/containernetworking/cni/pkg/types/100"
 	"github.com/containernetworking/plugins/pkg/ns"
@@ -10,10 +15,6 @@ import (
 	"github.com/vishvananda/netlink"
 	"go.uber.org/zap"
 	"golang.org/x/sys/unix"
-	"net"
-	"os"
-	"regexp"
-	"strings"
 )
 
 var DefaultInterfacesToExclude = []string{
@@ -86,21 +87,22 @@ func IPAddressOnNode(logger *zap.Logger, ipFamily int) ([]netlink.Addr, error) {
 		return nil, err
 	}
 
-	var ipAddress []netlink.Addr
-	for _, link := range links {
-		exclude := (excludeRegexp != nil) && excludeRegexp.MatchString(link.Attrs().Name)
-		if exclude {
+	var allIPAddress []netlink.Addr
+	for idx, _ := range links {
+		iLink := links[idx]
+		if excludeRegexp.MatchString(iLink.Attrs().Name) {
 			continue
 		}
 
-		ipAddress, err = getAddrs(link, ipFamily)
+		ipAddress, err := getAddrs(iLink, ipFamily)
 		if err != nil {
 			logger.Error(err.Error())
 			return nil, err
 		}
+		allIPAddress = append(allIPAddress, ipAddress...)
 	}
-	logger.Debug("Get IPAddressOnNode", zap.Any("IPAddress", ipAddress))
-	return ipAddress, nil
+	logger.Debug("Get IPAddressOnNode", zap.Any("allIPAddress", allIPAddress))
+	return allIPAddress, nil
 }
 
 func getAddrs(link netlink.Link, ipfamily int) ([]netlink.Addr, error) {
@@ -114,10 +116,10 @@ func getAddrs(link netlink.Link, ipfamily int) ([]netlink.Addr, error) {
 		if addr.IP.IsMulticast() || addr.IP.IsLinkLocalUnicast() {
 			continue
 		}
-		if addr.IP.To4() != nil && (ipfamily == netlink.FAMILY_V4 || ipfamily == netlink.FAMILY_ALL) {
+		if addr.IP.To4() != nil && ipfamily != netlink.FAMILY_V6 {
 			ipAddress = append(ipAddress, addr)
 		}
-		if addr.IP.To4() == nil && (ipfamily == netlink.FAMILY_V6 || ipfamily == netlink.FAMILY_ALL) {
+		if addr.IP.To4() == nil && ipfamily != netlink.FAMILY_V4 {
 			ipAddress = append(ipAddress, addr)
 		}
 	}

pkg/types/types.go

@@ -1,8 +1,9 @@
 package types
 
 import (
-	"github.com/containernetworking/cni/pkg/types"
 	"net"
+
+	"github.com/containernetworking/cni/pkg/types"
 )
 
 type MoveRouteValue int32
@@ -50,3 +51,11 @@ type K8sArgs struct {
 	K8S_POD_INFRA_CONTAINER_ID types.UnmarshallableString //revive:disable-line
 	K8S_POD_UID                types.UnmarshallableString //revive:disable-line
 }
+
+const (
+	VethLogDefaultFilePath   = "/var/log/spider-io/veth.log"
+	RouterLogDefaultFilePath = "/var/log/spider-io/router.log"
+	LogDefaultMaxSize        = 100 // megabytes
+	LogDefaultMaxAge         = 5   // days
+	LogDefaultMaxBackups     = 5
+)

plugins/veth/veth.go

@@ -242,6 +242,7 @@ func setupNeighborhood(logger *zap.Logger, netns ns.NetNS, hostVethPairName stri
 	}
 
 	if !isfirstInterface {
+		// In the pod, we have already add neighbor table, so exit...
 		return nil
 	}