[bridgeconfig] move nextHops to the gateway where it is used.

Signed-off-by: Nadia Pinaeva <[email protected]>

Author: npinaeva

go-controller/pkg/node/bridgeconfig/bridgeconfig.go

@@ -81,13 +81,11 @@ type BridgeConfiguration struct {
 	ofPortPhys string
 	netConfig  map[string]*BridgeUDNConfiguration
 	eipMarkIPs *egressip.MarkIPsCache
-	nextHops   []net.IP
 }
 
 func NewBridgeConfiguration(intfName, nodeName,
 	physicalNetworkName string,
 	nodeSubnets, gwIPs []*net.IPNet,
-	gwNextHops []net.IP,
 	advertised bool) (*BridgeConfiguration, error) {
 	var intfRep string
 	var err error
@@ -106,9 +104,6 @@ func NewBridgeConfiguration(intfName, nodeName,
 		},
 		eipMarkIPs: egressip.NewMarkIPsCache(),
 	}
-	if len(gwNextHops) > 0 {
-		res.nextHops = gwNextHops
-	}
 	res.netConfig[types.DefaultNetworkName].Advertised.Store(advertised)
 
 	if config.Gateway.GatewayAcceleratedInterface != "" {
@@ -475,18 +470,6 @@ func (b *BridgeConfiguration) SetEIPMarkIPs(eipMarkIPs *egressip.MarkIPsCache) {
 	b.eipMarkIPs = eipMarkIPs
 }
 
-func (b *BridgeConfiguration) GetNextHops() []net.IP {
-	b.Mutex.Lock()
-	defer b.Mutex.Unlock()
-	return b.nextHops
-}
-
-func (b *BridgeConfiguration) SetNextHops(nextHops []net.IP) {
-	b.Mutex.Lock()
-	defer b.Mutex.Unlock()
-	b.nextHops = nextHops
-}
-
 func gatewayReady(patchPort string) bool {
 	// Get ofport of patchPort
 	ofport, _, err := util.GetOVSOfPort("--if-exists", "get", "interface", patchPort, "ofport")

go-controller/pkg/node/gateway.go

@@ -60,6 +60,8 @@ type gateway struct {
 	watchFactory *factory.WatchFactory // used for retry
 	stopChan     <-chan struct{}
 	wg           *sync.WaitGroup
+
+	nextHops []net.IP
 }
 
 func (g *gateway) AddService(svc *corev1.Service) error {
@@ -357,13 +359,13 @@ func setupUDPAggregationUplink(ifname string) error {
 func gatewayInitInternal(nodeName, gwIntf, egressGatewayIntf string, gwNextHops []net.IP, nodeSubnets, gwIPs []*net.IPNet,
 	advertised bool, nodeAnnotator kube.Annotator) (
 	*bridgeconfig.BridgeConfiguration, *bridgeconfig.BridgeConfiguration, error) {
-	gatewayBridge, err := bridgeconfig.NewBridgeConfiguration(gwIntf, nodeName, types.PhysicalNetworkName, nodeSubnets, gwIPs, gwNextHops, advertised)
+	gatewayBridge, err := bridgeconfig.NewBridgeConfiguration(gwIntf, nodeName, types.PhysicalNetworkName, nodeSubnets, gwIPs, advertised)
 	if err != nil {
 		return nil, nil, fmt.Errorf("bridge for interface failed for %s: %w", gwIntf, err)
 	}
 	var egressGWBridge *bridgeconfig.BridgeConfiguration
 	if egressGatewayIntf != "" {
-		egressGWBridge, err = bridgeconfig.NewBridgeConfiguration(egressGatewayIntf, nodeName, types.PhysicalNetworkExGwName, nodeSubnets, nil, nil, false)
+		egressGWBridge, err = bridgeconfig.NewBridgeConfiguration(egressGatewayIntf, nodeName, types.PhysicalNetworkExGwName, nodeSubnets, nil, false)
 		if err != nil {
 			return nil, nil, fmt.Errorf("bridge for interface failed for %s: %w", egressGatewayIntf, err)
 		}

go-controller/pkg/node/gateway_shared_intf.go

@@ -1425,7 +1425,9 @@ func newGateway(
 	gatewayMode config.GatewayMode,
 ) (*gateway, error) {
 	klog.Info("Creating new gateway")
-	gw := &gateway{}
+	gw := &gateway{
+		nextHops: gwNextHops,
+	}
 
 	if gatewayMode == config.GatewayModeLocal {
 		if err := initLocalGateway(subnets, mgmtPort); err != nil {

go-controller/pkg/node/gateway_udn.go

@@ -599,7 +599,7 @@ func (udng *UserDefinedNetworkGateway) getDefaultRoute(isNetworkAdvertised bool)
 
 	var retVal []netlink.Route
 	var defaultAnyCIDR *net.IPNet
-	for _, nextHop := range udng.gateway.openflowManager.defaultBridge.GetNextHops() {
+	for _, nextHop := range udng.gateway.nextHops {
 		isV6 := utilnet.IsIPv6(nextHop)
 		_, defaultAnyCIDR, _ = net.ParseCIDR("0.0.0.0/0")
 		if isV6 {

go-controller/pkg/node/gateway_udn_test.go

@@ -1380,8 +1380,8 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 		err = testNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			ofm := getDummyOpenflowManager()
-			ofm.defaultBridge.SetNextHops(ovntest.MustParseIPs(config.Gateway.NextHop))
-			udnGateway, err := NewUserDefinedNetworkGateway(mutableNetInfo, node, nil, nil, vrf, nil, &gateway{openflowManager: ofm})
+			udnGateway, err := NewUserDefinedNetworkGateway(mutableNetInfo, node, nil, nil, vrf, nil,
+				&gateway{openflowManager: ofm, nextHops: ovntest.MustParseIPs(config.Gateway.NextHop)})
 			Expect(err).NotTo(HaveOccurred())
 			mplink, err := netlink.LinkByName(mgtPort)
 			Expect(err).NotTo(HaveOccurred())