!27 add fdb for flannel which is needed 4 connectivity

Merge pull request !27 from niklaus-x/add-fdb-4-node-reconcile-add-gomod

Author: Niklaus-xie

controllers/v1_controller.go

@@ -95,6 +95,11 @@ func (r *NodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 	ocfgs := map[string]interface{}{}
 	ncfgs := map[string]interface{}{}
 
+	oIpToMacV4 := map[string]string{}
+	// oIpToMacV6 := map[string]string{}
+	nIpToMacV4 := map[string]string{}
+	// nIpToMacV6 := map[string]string{}
+
 	var obj v1.Node
 	zlog := log.FromContext(ctx)
 	zlog.V(1).Info("resource event: " + req.NamespacedName.String())
@@ -137,6 +142,13 @@ func (r *NodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 			}
 		}
 
+		if pkg.ActiveSIGs.Mode == "flannel" {
+			oIpToMacV4, _ = k8s.NodeCache.AllIpToMac()
+			if ocfgs, err = pkg.ParseFdbsFrom(pkg.ActiveSIGs.VxlanTunnelName, oIpToMacV4); err != nil {
+				return ctrl.Result{}, err
+			}
+		}
+
 		k8s.NodeCache.Set(obj.DeepCopy())
 
 		if pkg.ActiveSIGs.Mode == "calico" {
@@ -145,14 +157,21 @@ func (r *NodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 				return ctrl.Result{}, err
 			}
 
-			pkg.PendingDeploys <- pkg.DeployRequest{
-				Meta:       fmt.Sprintf("refreshing neighs for node '%s'", req.Name),
-				From:       &ocfgs,
-				To:         &ncfgs,
-				StatusFunc: func() {},
-				Partition:  "Common",
+		}
+
+		if pkg.ActiveSIGs.Mode == "flannel" {
+			nIpToMacV4, _ = k8s.NodeCache.AllIpToMac()
+			if ncfgs, err = pkg.ParseFdbsFrom(pkg.ActiveSIGs.VxlanTunnelName, nIpToMacV4); err != nil {
+				return ctrl.Result{}, err
 			}
 		}
+		pkg.PendingDeploys <- pkg.DeployRequest{
+			Meta:       fmt.Sprintf("refreshing for request '%s'", req.Name),
+			From:       &ocfgs,
+			To:         &ncfgs,
+			StatusFunc: func() {},
+			Partition:  "Common",
+		}
 	}
 	return ctrl.Result{}, nil
 }

go.mod

@@ -3,7 +3,7 @@ module gitee.com/zongzw/bigip-kubernetes-gateway
 go 1.19
 
 require (
-	gitee.com/zongzw/f5-bigip-rest v0.0.0-20221130015610-8a29e5ce86f8
+	gitee.com/zongzw/f5-bigip-rest v0.0.0-20221205102327-fa38879c1630
 	github.com/onsi/ginkgo/v2 v2.3.1
 	github.com/onsi/gomega v1.22.1
 	github.com/prometheus/client_golang v1.13.0

go.sum

@@ -44,8 +44,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-gitee.com/zongzw/f5-bigip-rest v0.0.0-20221130015610-8a29e5ce86f8 h1:fSZ3htadktrBRev5bqA6LuQVAdGh3sjQUERVDHmxRa4=
-gitee.com/zongzw/f5-bigip-rest v0.0.0-20221130015610-8a29e5ce86f8/go.mod h1:jx0Y6qhir/J/75V5tCYrLlmKPaZUEfbCg8fS6Xo6Syw=
+gitee.com/zongzw/f5-bigip-rest v0.0.0-20221205102327-fa38879c1630 h1:ohgztWDK54plXV9PZ+1ABa4vwQCEi1+ANcEfd23Jt8M=
+gitee.com/zongzw/f5-bigip-rest v0.0.0-20221205102327-fa38879c1630/go.mod h1:jx0Y6qhir/J/75V5tCYrLlmKPaZUEfbCg8fS6Xo6Syw=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A=

k8s/k8s.go

@@ -127,3 +127,24 @@ func (ns *Nodes) AllIpAddresses() []string {
 	}
 	return rlt
 }
+
+func (ns *Nodes) AllIpToMac() (map[string]string, map[string]string) {
+	NodeCache.mutex <- true
+	defer func() { <-NodeCache.mutex }()
+
+	rlt4 := map[string]string{}
+	rlt6 := map[string]string{}
+
+	for _, n := range ns.Items {
+		if len(n.IpAddr) > 0 && len(n.MacAddr) > 0 {
+			slog.Infof("n.IpAddress is %s:", n.IpAddr)
+			rlt4[n.IpAddr] = n.MacAddr
+		}
+		if len(n.IpAddrV6) > 0 && len(n.MacAddrV6) > 0 {
+			slog.Infof("n.IpAddrV6 is %s:", n.IpAddrV6)
+			rlt6[n.IpAddrV6] = n.MacAddrV6
+		}
+
+	}
+	return rlt4, rlt6
+}

main.go

@@ -92,13 +92,13 @@ func main() {
 	flag.StringVar(&credsDir, "credentials-directory", "", "Optional, directory that contains the BIG-IP username,"+
 		"password, and/or url files. To be used instead of username, password, and/or url arguments.")
 	flag.StringVar(&controllerName, "controller-name", "f5.io/gateway-controller-name", "This controller name.")
-	flag.StringVar(&mode, "mode", "flannel", "if set to calico or flannel, will make some related configs onto bigip automatically.")
+	flag.StringVar(&mode, "mode", "", "if set to calico or flannel, will make some related configs onto bigip automatically.")
 	flag.StringVar(&vxlanProfileName, "vxlan-profile-name", "fl-vxlan", "vxlan profile name on bigip.")
 	flag.StringVar(&vxlanPort, "vxlan-port", "8472", "port number in the vxlan profile.")
 	flag.StringVar(&vxlanTunnelName, "vxlan-tunnel-name", "fl-vxlan", "vxlan tunnel name on bigip.")
-	flag.StringVar(&vxlanLocalAddress, "vxlan-local-address", "9.4.4.4", "local address in the vxlan tunnel. e.g. 192.168.2.100")
+	flag.StringVar(&vxlanLocalAddress, "vxlan-local-address", "", "local address in the vxlan tunnel. e.g. 192.168.2.100")
 	flag.StringVar(&selfIpName, "selfip-name", "flannel-self", "flannel selfip name.")
-	flag.StringVar(&selfIpAddress, "selfip-address", "5.5.5.5/28", "flannel selfip ip address. e.g. 192.168.1.100/24")
+	flag.StringVar(&selfIpAddress, "selfip-address", "", "flannel selfip ip address. e.g. 192.168.1.100/24")
 
 	opts := zap.Options{
 		Development: true,
@@ -108,6 +108,7 @@ func main() {
 
 	pkg.ActiveSIGs.ControllerName = controllerName
 	pkg.ActiveSIGs.Mode = mode
+	pkg.ActiveSIGs.VxlanTunnelName = vxlanTunnelName
 
 	if (len(bigipUrl) == 0 || len(bigipUsername) == 0 ||
 		len(bigipPassword) == 0) && len(credsDir) == 0 {

pkg/parser.go

@@ -625,3 +625,26 @@ func ParseNeighsFrom(routerName, localAs, remoteAs string, addresses []string) (
 		"": rlt,
 	}, nil
 }
+
+func ParseFdbsFrom(tunnelName string, iPToMac map[string]string) (map[string]interface{}, error) {
+	rlt := map[string]interface{}{}
+
+	rlt["net/fdb/tunnel/"+tunnelName] = map[string]interface{}{
+		"records": []interface{}{},
+	}
+
+	fmtrecords := []interface{}{}
+	for ip, mac := range iPToMac {
+		slog.Infof("parse ip address: %s and mac: %s", ip, mac)
+		fmtrecords = append(fmtrecords, map[string]string{
+			"name":     mac,
+			"endpoint": ip,
+		})
+	}
+
+	rlt["net/fdb/tunnel/"+tunnelName].(map[string]interface{})["records"] = fmtrecords
+
+	return map[string]interface{}{
+		"": rlt,
+	}, nil
+}

pkg/types.go

@@ -22,16 +22,17 @@ type ParseRequest struct {
 }
 
 type SIGCache struct {
-	mutex          sync.RWMutex
-	SyncedAtStart  bool
-	ControllerName string
-	Mode           string
-	Gateway        map[string]*gatewayv1beta1.Gateway
-	HTTPRoute      map[string]*gatewayv1beta1.HTTPRoute
-	Endpoints      map[string]*v1.Endpoints
-	Service        map[string]*v1.Service
-	GatewayClasses map[string]*gatewayv1beta1.GatewayClass
-	Bigip          *f5_bigip.BIGIP
+	mutex           sync.RWMutex
+	SyncedAtStart   bool
+	ControllerName  string
+	Mode            string
+	VxlanTunnelName string
+	Gateway         map[string]*gatewayv1beta1.Gateway
+	HTTPRoute       map[string]*gatewayv1beta1.HTTPRoute
+	Endpoints       map[string]*v1.Endpoints
+	Service         map[string]*v1.Service
+	GatewayClasses  map[string]*gatewayv1beta1.GatewayClass
+	Bigip           *f5_bigip.BIGIP
 	// Node      map[string]*v1.Node
 }
 

pkg/utils.go

@@ -24,16 +24,17 @@ func init() {
 	PendingParses = make(chan ParseRequest, 16)
 	slog = utils.SetupLog("", "debug")
 	ActiveSIGs = &SIGCache{
-		mutex:          sync.RWMutex{},
-		SyncedAtStart:  false,
-		ControllerName: "",
-		Mode:           "",
-		Gateway:        map[string]*gatewayv1beta1.Gateway{},
-		HTTPRoute:      map[string]*gatewayv1beta1.HTTPRoute{},
-		Endpoints:      map[string]*v1.Endpoints{},
-		Service:        map[string]*v1.Service{},
-		GatewayClasses: map[string]*gatewayv1beta1.GatewayClass{},
-		Bigip:          nil,
+		mutex:           sync.RWMutex{},
+		SyncedAtStart:   false,
+		ControllerName:  "",
+		Mode:            "",
+		VxlanTunnelName: "",
+		Gateway:         map[string]*gatewayv1beta1.Gateway{},
+		HTTPRoute:       map[string]*gatewayv1beta1.HTTPRoute{},
+		Endpoints:       map[string]*v1.Endpoints{},
+		Service:         map[string]*v1.Service{},
+		GatewayClasses:  map[string]*gatewayv1beta1.GatewayClass{},
+		Bigip:           nil,
 		// Node:      map[string]*v1.Node{},
 	}
 }