Use NetInfo in management port

Signed-off-by: Jaime Caamaño Ruiz <[email protected]>

Author: jcaamano

go-controller/pkg/node/managementport/port.go

@@ -4,7 +4,6 @@ import (
 	"net"
 	"time"
 
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
 	"k8s.io/klog/v2"
@@ -47,8 +46,6 @@ func (c *managementPortController) Start(stopChan <-chan struct{}) error {
 }
 
 func (c *managementPortController) Reconcile() {
-	advertised := util.IsPodNetworkAdvertisedAtNode(c.netInfo, c.nodeName)
-	c.cfg.isPodNetworkAdvertised.Store(advertised)
 	c.reconcile()
 }
 

go-controller/pkg/node/managementport/port_config.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net"
 	"strings"
-	"sync/atomic"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/klog/v2"
@@ -25,7 +24,7 @@ type managementPortConfig struct {
 	ipv4 *managementPortIPFamilyConfig
 	ipv6 *managementPortIPFamilyConfig
 
-	isPodNetworkAdvertised atomic.Bool
+	netInfo util.NetInfo
 }
 
 func newManagementPortConfig(node *corev1.Node, hostSubnets []*net.IPNet, netInfo util.NetInfo) (*managementPortConfig, error) {
@@ -57,11 +56,9 @@ func newManagementPortConfig(node *corev1.Node, hostSubnets []*net.IPNet, netInf
 		nodeName:    nodeName,
 		hostSubnets: hostSubnets,
 		mpMAC:       mpMAC,
+		netInfo:     netInfo,
 	}
 
-	advertised := util.IsPodNetworkAdvertisedAtNode(netInfo, node.Name)
-	mpcfg.isPodNetworkAdvertised.Store(advertised)
-
 	for _, hostSubnet := range hostSubnets {
 		isIPv6 := utilnet.IsIPv6CIDR(hostSubnet)
 

go-controller/pkg/node/managementport/port_linux.go

@@ -48,7 +48,6 @@ type managementPortController struct {
 	cfg   *managementPortConfig
 
 	nodeName string
-	netInfo  util.NetInfo
 
 	reconcile func()
 }
@@ -371,7 +370,7 @@ func setupManagementPortNFTChain(interfaceName string, cfg *managementPortConfig
 		),
 	})
 
-	isPodNetworkAdvertised := cfg.isPodNetworkAdvertised.Load()
+	isPodNetworkAdvertised := util.IsPodNetworkAdvertisedAtNode(cfg.netInfo, cfg.nodeName)
 
 	if cfg.ipv4 != nil {
 		if isPodNetworkAdvertised {

go-controller/pkg/node/managementport/port_linux_test.go

@@ -770,15 +770,21 @@ var _ = Describe("Management Port tests", func() {
 			It("removes stale nftables rules while keeping remaining intact", func() {
 				nft := nodenft.SetFakeNFTablesHelper()
 
+				netInfo := &multinetworkmocks.NetInfo{}
+				netInfo.On("GetPodNetworkAdvertisedOnNodeVRFs", "").Return(nil)
+
 				// Make a fake MgmtPortConfig with only the fields we care about
 				nodeNet := ovntest.MustParseIPNet("10.1.1.0/24")
 				fakeMgmtPortIPFamilyConfig := managementPortIPFamilyConfig{
 					ifAddr: nodeNet,
 				}
 				fakeMgmtPortConfig := managementPortConfig{
-					ipv4: &fakeMgmtPortIPFamilyConfig,
+					ipv4:    &fakeMgmtPortIPFamilyConfig,
+					netInfo: netInfo,
 				}
-				err := setupManagementPortNFTChain(types.K8sMgmtIntfName, &fakeMgmtPortConfig)
+				err := setupManagementPortNFTSets()
+				Expect(err).NotTo(HaveOccurred())
+				err = setupManagementPortNFTChain(types.K8sMgmtIntfName, &fakeMgmtPortConfig)
 				Expect(err).NotTo(HaveOccurred())
 
 				finalExpectedNFT := nft.Dump()