Fix for traffic not working in cluster mode (#3359)

F5Networks · Mar 29, 2024 · f16692d · f16692d
1 parent 721bc25
commit f16692d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/pkg/controller/node_poll_handler.go b/pkg/controller/node_poll_handler.go
@@ -212,7 +212,7 @@ func (ctlr *Controller) processStaticRouteUpdate() {
 			}
 			l3Forward := networkmanager.L3Forward{
 				Config: networkmanager.StaticRouteConfig{},
-				VLANs:  []int{},
+				VRF:    networkmanager.DefaultL3Network,
 			}
 			// For ovn-k8s get pod subnet and node ip from annotation
 			if ctlr.OrchestrationCNI == OVN_K8S {

diff --git a/pkg/networkmanager/networkmanager.go b/pkg/networkmanager/networkmanager.go
@@ -28,6 +28,7 @@ const (
 	networkManagerPrefix = "[NetworkManager]"
 	timeoutSmall         = 2 * time.Second
 	timeoutLarge         = 180 * time.Second
+	DefaultL3Network     = "Default L3-Network"
 )
 
 // NetworkManager is responsible for managing the network objects on central manager.
@@ -56,7 +57,7 @@ type (
 	// L3Forward struct represents the structure of the L3Forward in the JSON response
 	L3Forward struct {
 		ID     string            `json:"id,omitempty"`
-		VLANs  []int             `json:"vlans"`
+		VRF    string            `json:"vrf"`
 		Name   string            `json:"name"`
 		Config StaticRouteConfig `json:"config"`
 	}
@@ -247,12 +248,14 @@ func (nm *NetworkManager) GetL3ForwardsFromInstance(instanceId string, controlle
 						config.L3ForwardType, _ = configData["l3ForwardType"].(string)
 					}
 
-					if idOk && nameOk {
+					vrfData, vrfOk := l3Forward["payload"].(map[string]interface{})["vrf"].(string)
+
+					if idOk && nameOk && vrfOk {
 						staticRoutes[config] = L3Forward{
 							ID:     id,
 							Name:   name,
 							Config: config,
-							VLANs:  []int{},
+							VRF:    vrfData,
 						}
 					}
 				}

diff --git a/pkg/networkmanager/networkmanager_test.go b/pkg/networkmanager/networkmanager_test.go
@@ -54,8 +54,8 @@ var _ = Describe("Network Manager Tests", func() {
 						Destination:   "10.244.0.0/24",
 						L3ForwardType: L3RouteGateway,
 					},
-					VLANs: []int{},
-					Name:  "test",
+					VRF:  DefaultL3Network,
+					Name: "test",
 				}
 				// Mock the server
 				server = ghttp.NewServer()
@@ -198,8 +198,8 @@ var _ = Describe("Network Manager Tests", func() {
 						Destination:   "10.244.0.0/24",
 						L3ForwardType: L3RouteGateway,
 					},
-					VLANs: []int{},
-					Name:  "test",
+					VRF:  DefaultL3Network,
+					Name: "test",
 				}
 				// Mock the server
 				server = ghttp.NewServer()
@@ -369,8 +369,8 @@ var _ = Describe("Network Manager Tests", func() {
 						Destination:   "10.244.0.0/24",
 						L3ForwardType: L3RouteGateway,
 					},
-					VLANs: []int{},
-					Name:  "test",
+					VRF:  DefaultL3Network,
+					Name: "test",
 				}
 				// Mock the server
 				server = ghttp.NewServer()
@@ -417,12 +417,13 @@ var _ = Describe("Network Manager Tests", func() {
                         "gateway": "10.4.0.234",
                         "destination": "10.244.0.0/24",
                         "l3ForwardType": "L3RouteGateway"
-                    }
+                    },
+					"vrf": "%s"
                 }
             }
 ]
     }
-}`, L3ForwardId, BigIpId)
+}`, L3ForwardId, BigIpId, DefaultL3Network)
 				server.AppendHandlers(
 					ghttp.CombineHandlers(
 						ghttp.VerifyRequest("GET", InstancesURI+BigIpId+L3Forwards),