AV-232614 Static Route related fixes

Author: pkoshtavmware

internal/lib/utils.go

@@ -18,10 +18,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"log"
 	"regexp"
 	"strings"
 	"sync"
 
+	"github.com/google/uuid"
+
 	routev1 "github.com/openshift/api/route/v1"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
@@ -594,3 +597,11 @@ func (s *LockSet) Unlock(lockName string) {
 func GetLockSet() *LockSet {
 	return &lockSet
 }
+
+func Uuid4() string {
+	id, err := uuid.NewRandom()
+	if err != nil {
+		log.Fatal(err)
+	}
+	return id.String()
+}

internal/nodes/avi_model_nodes.go

@@ -323,17 +323,15 @@ func (o *AviObjectGraph) GetOrderedNodes() []AviModelNode {
 }
 
 type StaticRouteDetails struct {
-	StartIndex int
-	Count      int
-	routeID    int
+	Count         int
+	RouteIDPrefix string
 }
 type AviVrfNode struct {
 	Name             string
 	StaticRoutes     []*avimodels.StaticRoute
 	CloudConfigCksum uint32
 	NodeStaticRoutes map[string]StaticRouteDetails
 	Nodes            []string
-	NodeIds          map[int]struct{}
 }
 
 func (v *AviVrfNode) GetCheckSum() uint32 {

internal/nodes/avi_vrf_translator.go

@@ -16,13 +16,11 @@ package nodes
 
 import (
 	"errors"
-	"math"
 	"regexp"
 	"strconv"
 	"strings"
 
 	"github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/internal/lib"
-
 	"github.com/vmware/load-balancer-and-ingress-services-for-kubernetes/pkg/utils"
 
 	"github.com/vmware/alb-sdk/go/models"
@@ -45,10 +43,8 @@ func (o *AviObjectGraph) BuildVRFGraph(key, vrfName, nodeName string, deleteFlag
 	// Each AKO should have single VRF node as it deals with single cluster only.
 	aviVrfNode := aviVrfNodes[0]
 
-	routeid := 1
 	if len(aviVrfNode.StaticRoutes) == 0 {
 		aviVrfNode.NodeStaticRoutes = make(map[string]StaticRouteDetails)
-		aviVrfNode.NodeIds = make(map[int]struct{})
 	}
 	var nodeRoutes []*models.StaticRoute
 	// For new node addition (coming from ingestion layer), nodes static routes will be attahced at the end
@@ -60,19 +56,36 @@ func (o *AviObjectGraph) BuildVRFGraph(key, vrfName, nodeName string, deleteFlag
 		node, err := utils.GetInformers().NodeInformer.Lister().Get(nodeName)
 		if err != nil {
 			utils.AviLog.Errorf("key: %s, Error in fetching node details: %s: %v", key, nodeName, err)
+			var staticRouteCopy []*models.StaticRoute
+			for i := 0; i < len(aviVrfNode.StaticRoutes); i++ {
+				if !strings.HasPrefix(*aviVrfNode.StaticRoutes[i].RouteID, nodeStaticRouteDetails.RouteIDPrefix) {
+					staticRouteCopy = append(staticRouteCopy, aviVrfNode.StaticRoutes[i])
+				}
+			}
+			aviVrfNode.StaticRoutes = staticRouteCopy
+			processNodeStaticRouteAndNodeDeletion(nodeName, aviVrfNode)
 			return err
 		}
+		var routeIdPrefix string
 		if ok {
-			routeid = nodeStaticRouteDetails.routeID
+			routeIdPrefix = nodeStaticRouteDetails.RouteIDPrefix
 		} else {
-			//O(n) for each node. But it will re-use previous index. So used instead of always incrementing index.
-			routeid = findFreeRouteId(aviVrfNode.NodeIds)
+			routeIdPrefix = lib.Uuid4()
 		}
-		aviVrfNode.NodeIds[routeid] = struct{}{}
-		nodeRoutes, err = o.addRouteForNode(node, vrfName, routeid, aviVrfNode.NodeIds)
+
+		nodeRoutes, err = o.addRouteForNode(node, vrfName, routeIdPrefix)
 		if err != nil {
 			utils.AviLog.Errorf("key: %s, Error Adding vrf for node %s: %v", key, nodeName, err)
-			delete(aviVrfNode.NodeIds, routeid)
+
+			//delete all the routes of this node
+			var staticRouteCopy []*models.StaticRoute
+			for i := 0; i < len(aviVrfNode.StaticRoutes); i++ {
+				if !strings.HasPrefix(*aviVrfNode.StaticRoutes[i].RouteID, lib.GetClusterName() + "-" +routeIdPrefix) {
+					staticRouteCopy = append(staticRouteCopy, aviVrfNode.StaticRoutes[i])
+				}
+			}
+			aviVrfNode.StaticRoutes = staticRouteCopy
+			processNodeStaticRouteAndNodeDeletion(nodeName, aviVrfNode)
 			return err
 		}
 		if !ok {
@@ -81,62 +94,64 @@ func (o *AviObjectGraph) BuildVRFGraph(key, vrfName, nodeName string, deleteFlag
 				// node is not present and no overlapping of cidr, append at last
 				aviVrfNode.StaticRoutes = append(aviVrfNode.StaticRoutes, nodeRoutes...)
 				nodeStaticRoute := StaticRouteDetails{}
-				// start index shows at what index of StaticRoutes, nodes routes start (index based zero)
-				nodeStaticRoute.StartIndex = routeid - 1
 				nodeStaticRoute.Count = len(nodeRoutes)
-				nodeStaticRoute.routeID = routeid
+				nodeStaticRoute.RouteIDPrefix = routeIdPrefix
 				aviVrfNode.NodeStaticRoutes[nodeName] = nodeStaticRoute
 				aviVrfNode.Nodes = append(aviVrfNode.Nodes, nodeName)
 			} else {
 				if len(nodeRoutes) == 0 {
-					delete(aviVrfNode.NodeIds, routeid)
+					//delete all the routes and details of this node
+					var staticRouteCopy []*models.StaticRoute
+					for i := 0; i < len(aviVrfNode.StaticRoutes); i++ {
+						if !strings.HasPrefix(*aviVrfNode.StaticRoutes[i].RouteID, lib.GetClusterName() + "-" + routeIdPrefix) {
+							staticRouteCopy = append(staticRouteCopy, aviVrfNode.StaticRoutes[i])
+						}
+					}
+					aviVrfNode.StaticRoutes = staticRouteCopy
+					processNodeStaticRouteAndNodeDeletion(nodeName, aviVrfNode)
 				}
 			}
 		} else {
 			// update case
-			// Assumption: updated routes (values) for given node will not overlap with other nodes.
+			// Assumption: updated routes (values) for given node will not overlap with other nodes
 			// So only updating existing routes of that node.
 			utils.AviLog.Debugf("key: %s, StaticRoutes before updation/deletion: [%v]", key, utils.Stringify(aviVrfNode.StaticRoutes))
-			startIndex := nodeStaticRouteDetails.StartIndex
 			lenNewNodeRoutes := len(nodeRoutes)
 			diff := lenNewNodeRoutes - nodeStaticRouteDetails.Count
 
 			var staticRouteCopy []*models.StaticRoute
-			copyTill := int(math.Min(float64(startIndex), float64(len(aviVrfNode.StaticRoutes))))
-			staticRouteCopy = append(staticRouteCopy, aviVrfNode.StaticRoutes[:copyTill]...)
+			for i := 0; i < len(aviVrfNode.StaticRoutes); i++ {
+				if !strings.HasPrefix(*aviVrfNode.StaticRoutes[i].RouteID, lib.GetClusterName() + "-" + routeIdPrefix) {
+					staticRouteCopy = append(staticRouteCopy, aviVrfNode.StaticRoutes[i])
+				}
+			}
 
 			staticRouteCopy = append(staticRouteCopy, nodeRoutes...)
-
-			copyFrom := int(math.Min(float64(startIndex+nodeStaticRouteDetails.Count), float64(len(aviVrfNode.StaticRoutes))))
-			staticRouteCopy = append(staticRouteCopy, aviVrfNode.StaticRoutes[copyFrom:]...)
-
 			aviVrfNode.StaticRoutes = staticRouteCopy
 
 			//if diff is 0, there is no change in number of routes previously exist and newly created.
 			if diff != 0 {
-				updateNodeStaticRoutes(aviVrfNode, deleteFlag, nodeName, lenNewNodeRoutes, diff)
+				//update all the routes of this node
+				updateNodeStaticRoutes(aviVrfNode, deleteFlag, nodeName, lenNewNodeRoutes)
 			}
 			if lenNewNodeRoutes == 0 {
-				processNodeStaticRouteAndNodeIdDeletion(nodeName, aviVrfNode)
+				//delete all the routes of this node
+				processNodeStaticRouteAndNodeDeletion(nodeName, aviVrfNode)
 			}
 			utils.AviLog.Debugf("key: %s, StaticRoutes after updation/deletion: [%v]", key, utils.Stringify(aviVrfNode.StaticRoutes))
 		}
 	} else {
-		//delete case
+		//delete flag is turned on and node is deleted
 		utils.AviLog.Debugf("key: %s, StaticRoutes before deletion: [%v]", key, utils.Stringify(aviVrfNode.StaticRoutes))
-		startIndex := nodeStaticRouteDetails.StartIndex
-		count := nodeStaticRouteDetails.Count
-		var staticRouteCopy []*models.StaticRoute
-		updateNodeStaticRoutes(aviVrfNode, deleteFlag, nodeName, 0, -count)
-
-		copyTill := int(math.Min(float64(startIndex), float64(len(aviVrfNode.StaticRoutes))))
-		staticRouteCopy = append(staticRouteCopy, aviVrfNode.StaticRoutes[:copyTill]...)
-
-		copyFrom := int(math.Min(float64(startIndex+nodeStaticRouteDetails.Count), float64(len(aviVrfNode.StaticRoutes))))
-		staticRouteCopy = append(staticRouteCopy, aviVrfNode.StaticRoutes[copyFrom:]...)
 
+		var staticRouteCopy []*models.StaticRoute
+		for i := 0; i < len(aviVrfNode.StaticRoutes); i++ {
+			if !ok || !strings.HasPrefix(*aviVrfNode.StaticRoutes[i].RouteID, lib.GetClusterName() + "-" + nodeStaticRouteDetails.RouteIDPrefix) {
+				staticRouteCopy = append(staticRouteCopy, aviVrfNode.StaticRoutes[i])
+			}
+		}
 		aviVrfNode.StaticRoutes = staticRouteCopy
-		processNodeStaticRouteAndNodeIdDeletion(nodeName, aviVrfNode)
+		processNodeStaticRouteAndNodeDeletion(nodeName, aviVrfNode)
 		utils.AviLog.Debugf("key: %s, StaticRoutes after deletion: [%v]", key, utils.Stringify(aviVrfNode.StaticRoutes))
 	}
 	aviVrfNode.CalculateCheckSum()
@@ -145,29 +160,25 @@ func (o *AviObjectGraph) BuildVRFGraph(key, vrfName, nodeName string, deleteFlag
 	utils.AviLog.Debugf("key: %s, vrf node: [%v]", key, utils.Stringify(aviVrfNode))
 	return nil
 }
-func processNodeStaticRouteAndNodeIdDeletion(nodeName string, aviVrfNode *AviVrfNode) {
+func processNodeStaticRouteAndNodeDeletion(nodeName string, aviVrfNode *AviVrfNode) {
 	delete(aviVrfNode.NodeStaticRoutes, nodeName)
-	for nodeId := len(aviVrfNode.NodeIds); nodeId > len(aviVrfNode.StaticRoutes); nodeId-- {
-		delete(aviVrfNode.NodeIds, nodeId)
-	}
-}
-func findFreeRouteId(routeIdList map[int]struct{}) int {
-	for i := 1; i < math.MaxInt32; i++ {
-		if _, ok := routeIdList[i]; !ok {
-			return i
+	nodesCopy := []string{}
+	for _, node := range aviVrfNode.Nodes {
+		if node != nodeName {
+			nodesCopy = append(nodesCopy, node)
 		}
 	}
-	return -1
+	aviVrfNode.Nodes = nodesCopy
 }
-func updateNodeStaticRoutes(aviVrfNode *AviVrfNode, isDelete bool, nodeName string, lenNewNodeRoutes, diff int) {
+
+func updateNodeStaticRoutes(aviVrfNode *AviVrfNode, isDelete bool, nodeNameToUpdate string, lenNewNodeRoutes int) {
 	//get index of nodename in node array
 	indexOfNodeUnderUpdation := -1
 
 	for i := 0; i < len(aviVrfNode.Nodes); i++ {
-		if aviVrfNode.Nodes[i] == nodeName {
+		if aviVrfNode.Nodes[i] == nodeNameToUpdate {
 			indexOfNodeUnderUpdation = i
 			if !isDelete {
-				nodeNameToUpdate := aviVrfNode.Nodes[indexOfNodeUnderUpdation]
 				nodeDetails := aviVrfNode.NodeStaticRoutes[nodeNameToUpdate]
 				nodeDetails.Count = lenNewNodeRoutes
 				aviVrfNode.NodeStaticRoutes[nodeNameToUpdate] = nodeDetails
@@ -176,32 +187,6 @@ func updateNodeStaticRoutes(aviVrfNode *AviVrfNode, isDelete bool, nodeName stri
 		}
 	}
 	if indexOfNodeUnderUpdation != -1 {
-		clusterName := lib.GetClusterName()
-		//Change nodemap entries till index
-		for nodeIndex := len(aviVrfNode.Nodes) - 1; nodeIndex > indexOfNodeUnderUpdation; nodeIndex-- {
-			nodeNameToUpdate := aviVrfNode.Nodes[nodeIndex]
-			nodeDetails := aviVrfNode.NodeStaticRoutes[nodeNameToUpdate]
-			oldStartIndex := nodeDetails.StartIndex
-			nodeDetails.StartIndex = nodeDetails.StartIndex + diff
-			nodeDetails.routeID = nodeDetails.StartIndex + 1
-			aviVrfNode.NodeStaticRoutes[nodeNameToUpdate] = nodeDetails
-			newRouteId := nodeDetails.routeID
-			var tempStartIndex int
-			if isDelete {
-				tempStartIndex = oldStartIndex
-			} else {
-				tempStartIndex = nodeDetails.StartIndex
-			}
-			for staticRouteIndex := tempStartIndex; staticRouteIndex < nodeDetails.Count+tempStartIndex; staticRouteIndex++ {
-				newRouteName := clusterName + "-" + strconv.Itoa(newRouteId)
-				if staticRouteIndex > (len(aviVrfNode.StaticRoutes)-1) || staticRouteIndex < 0 {
-					utils.AviLog.Warnf("Some StaticRoutes could not be updated.")
-					continue
-				}
-				aviVrfNode.StaticRoutes[staticRouteIndex].RouteID = &newRouteName
-				newRouteId++
-			}
-		}
 		// lenNewNodeRoutes will be zero if Node exists without any PodCidr/BloackAffinity attached to it.
 		if isDelete || lenNewNodeRoutes == 0 {
 			// now remove nodename from Nodes list
@@ -226,7 +211,7 @@ func findRoutePrefix(nodeRoutes, aviRoutes []*models.StaticRoute, key string) bo
 	return false
 }
 
-func (o *AviObjectGraph) addRouteForNode(node *v1.Node, vrfName string, routeid int, routeIdList map[int]struct{}) ([]*models.StaticRoute, error) {
+func (o *AviObjectGraph) addRouteForNode(node *v1.Node, vrfName string, routeIdPrefix string) ([]*models.StaticRoute, error) {
 	var nodeIP, nodeIP6 string
 	var nodeRoutes []*models.StaticRoute
 
@@ -243,7 +228,7 @@ func (o *AviObjectGraph) addRouteForNode(node *v1.Node, vrfName string, routeid
 		utils.AviLog.Errorf("Error in fetching Pod CIDR for %v: %s", node.ObjectMeta.Name, err.Error())
 		return nil, errors.New("podcidr not found")
 	}
-	for _, podCIDR := range podCIDRs {
+	for index, podCIDR := range podCIDRs {
 		podCIDRAndMask := strings.Split(podCIDR, "/")
 		if len(podCIDRAndMask) != 2 {
 			utils.AviLog.Errorf("Error in splitting Pod CIDR for %v", node.ObjectMeta.Name)
@@ -273,7 +258,7 @@ func (o *AviObjectGraph) addRouteForNode(node *v1.Node, vrfName string, routeid
 			continue
 		}
 		mask32 := int32(mask)
-		routeIDString := clusterName + "-" + strconv.Itoa(routeid)
+		routeIDString := clusterName + "-" + routeIdPrefix + "-" + strconv.Itoa(index)
 		nodeRoute := models.StaticRoute{
 			RouteID: &routeIDString,
 			Prefix: &models.IPAddrPrefix{
@@ -291,8 +276,6 @@ func (o *AviObjectGraph) addRouteForNode(node *v1.Node, vrfName string, routeid
 		}
 
 		nodeRoutes = append(nodeRoutes, &nodeRoute)
-		routeIdList[routeid] = struct{}{}
-		routeid++
 	}
 	return nodeRoutes, nil
 }