Remove default route if UDN network is advertised on its own VRF

Add or remove default route from a vrf device based on the network
is advertised on its own network or default network.

Default route from a VRF corresponding to a UDN does not get removed
if the network is advertised on default VRF.

default via 172.18.0.1 dev breth0 mtu 1400

Signed-off-by: Arnab Ghosh <[email protected]>

Author: arghosh93

go-controller/pkg/node/gateway.go

@@ -359,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) (
 	*bridgeConfiguration, *bridgeConfiguration, error) {
-	gatewayBridge, err := bridgeForInterface(gwIntf, nodeName, types.PhysicalNetworkName, nodeSubnets, gwIPs, advertised)
+	gatewayBridge, err := bridgeForInterface(gwIntf, nodeName, types.PhysicalNetworkName, nodeSubnets, gwIPs, gwNextHops, advertised)
 	if err != nil {
 		return nil, nil, fmt.Errorf("bridge for interface failed for %s: %w", gwIntf, err)
 	}
 	var egressGWBridge *bridgeConfiguration
 	if egressGatewayIntf != "" {
-		egressGWBridge, err = bridgeForInterface(egressGatewayIntf, nodeName, types.PhysicalNetworkExGwName, nodeSubnets, nil, false)
+		egressGWBridge, err = bridgeForInterface(egressGatewayIntf, nodeName, types.PhysicalNetworkExGwName, nodeSubnets, nil, nil, false)
 		if err != nil {
 			return nil, nil, fmt.Errorf("bridge for interface failed for %s: %w", egressGatewayIntf, err)
 		}
@@ -550,6 +550,7 @@ type bridgeConfiguration struct {
 	ofPortHost  string
 	netConfig   map[string]*bridgeUDNConfiguration
 	eipMarkIPs  *markIPsCache
+	nextHops    []net.IP
 }
 
 func (b *bridgeConfiguration) getGatewayIface() string {
@@ -590,7 +591,10 @@ func (b *bridgeConfiguration) updateInterfaceIPAddresses(node *corev1.Node) ([]*
 	return ifAddrs, nil
 }
 
-func bridgeForInterface(intfName, nodeName, physicalNetworkName string, nodeSubnets, gwIPs []*net.IPNet,
+func bridgeForInterface(intfName, nodeName,
+	physicalNetworkName string,
+	nodeSubnets, gwIPs []*net.IPNet,
+	gwNextHops []net.IP,
 	advertised bool) (*bridgeConfiguration, error) {
 	var intfRep string
 	var err error
@@ -609,6 +613,9 @@ func bridgeForInterface(intfName, nodeName, physicalNetworkName string, nodeSubn
 		},
 		eipMarkIPs: newMarkIPsCache(),
 	}
+	if len(gwNextHops) > 0 {
+		res.nextHops = gwNextHops
+	}
 	res.netConfig[types.DefaultNetworkName].advertised.Store(advertised)
 
 	if config.Gateway.GatewayAcceleratedInterface != "" {