[node/gateway] nodePortWatcher should use its own bridgeConfiguration.

It used to require addressManager to updateGatewayIPs only to get
bridgeConfig from it. We can just give nodePortWatcher its own
reference to the bridgeConfig.

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

Author: npinaeva

go-controller/pkg/node/gateway_localnet_linux_test.go

@@ -70,6 +70,7 @@ func initFakeNodePortWatcher(iptV4, iptV6 util.IPTablesHelper) *nodePortWatcher
 			defaultBridge: defaultBridge,
 		},
 		networkManager: networkmanager.Default().Interface(),
+		gwBridge:       bridgeconfig.TestBridgeConfig(""),
 	}
 	return &fNPW
 }

go-controller/pkg/node/gateway_shared_intf.go

@@ -190,7 +190,7 @@ type nodePortWatcher struct {
 	gatewayIPv6   string
 	gatewayIPLock sync.Mutex
 	ofportPhys    string
-	gwBridge      string
+	gwBridge      *bridgeconfig.BridgeConfiguration
 	// Map of service name to programmed iptables/OF rules
 	serviceInfo     map[ktypes.NamespacedName]*serviceConfig
 	serviceInfoLock sync.Mutex
@@ -216,9 +216,9 @@ type cidrAndFlags struct {
 	validLifetime     int
 }
 
-func (npw *nodePortWatcher) updateGatewayIPs(addressManager *addressManager) {
+func (npw *nodePortWatcher) updateGatewayIPs() {
 	// Get Physical IPs of Node, Can be IPV4 IPV6 or both
-	gatewayIPv4, gatewayIPv6 := getGatewayFamilyAddrs(addressManager.gatewayBridge.GetIPs())
+	gatewayIPv4, gatewayIPv6 := getGatewayFamilyAddrs(npw.gwBridge.GetIPs())
 
 	npw.gatewayIPLock.Lock()
 	defer npw.gatewayIPLock.Unlock()
@@ -368,7 +368,7 @@ func (npw *nodePortWatcher) updateServiceFlowCache(service *corev1.Service, netI
 		var ofPorts []string
 		// don't get the ports unless we need to as it is a costly operation
 		if (len(extParsedIPs) > 0 || len(ingParsedIPs) > 0) && add {
-			ofPorts, err = util.GetOpenFlowPorts(npw.gwBridge, false)
+			ofPorts, err = util.GetOpenFlowPorts(npw.gwBridge.GetGatewayIface(), false)
 			if err != nil {
 				// in the odd case that getting all ports from the bridge should not work,
 				// simply output to LOCAL (this should work well in the vast majority of cases, anyway)
@@ -1517,7 +1517,7 @@ func newGateway(
 			}
 			if gw.nodePortWatcher != nil {
 				npw, _ := gw.nodePortWatcher.(*nodePortWatcher)
-				npw.updateGatewayIPs(gw.nodeIPManager)
+				npw.updateGatewayIPs()
 			}
 			// Services create OpenFlow flows as well, need to update them all
 			if gw.servicesRetryFramework != nil {
@@ -1624,7 +1624,7 @@ func newNodePortWatcher(
 		gatewayIPv4:    gatewayIPv4,
 		gatewayIPv6:    gatewayIPv6,
 		ofportPhys:     ofportPhys,
-		gwBridge:       gwBridge.GetGatewayIface(),
+		gwBridge:       gwBridge,
 		serviceInfo:    make(map[ktypes.NamespacedName]*serviceConfig),
 		nodeIPManager:  nodeIPManager,
 		ofm:            ofm,