Removes stale code relying on networkID from nodes/caches

The networkID is stored in the NAD itself, and the network manager code
in OVNK will refuse the start the network controller if it does not have
the networkID. For backwards compatibility, when the NAD syncAll happens
it checks for the networkID on a node and then copies it as well to the
NAD in case it was missing previously.

There were stale functions in these network controllers
that were relying on setting a cached struct value of networkID, derived
from either the NAD or from the annotation on nodes at runtime. This is
duplicate information as the controllers all hold a reference to the NAD
itself, which is updated through network controller reconicliation.

This commit removes controller struct variables that store networkID,
and instead rely on the embedded NAD to get it. Also, removes network
controllers looking up networkID from nodes. The controllers should all
have the networkID on start up derived from the associated NAD.

Signed-off-by: Tim Rozet <[email protected]>

Author: trozet

go-controller/pkg/node/gateway_udn.go

@@ -50,8 +50,6 @@ const (
 type UserDefinedNetworkGateway struct {
 	// network information
 	util.NetInfo
-	// stores the networkID of this network
-	networkID int
 	// node that its programming things on
 	node          *corev1.Node
 	nodeLister    listers.NodeLister
@@ -222,7 +220,7 @@ func setBridgeNetworkOfPorts(bridge *bridgeConfiguration, netName string) error
 	return netConfig.setBridgeNetworkOfPortsInternal()
 }
 
-func NewUserDefinedNetworkGateway(netInfo util.NetInfo, networkID int, node *corev1.Node, nodeLister listers.NodeLister,
+func NewUserDefinedNetworkGateway(netInfo util.NetInfo, node *corev1.Node, nodeLister listers.NodeLister,
 	kubeInterface kube.Interface, vrfManager *vrfmanager.Controller, ruleManager *iprulemanager.Controller,
 	defaultNetworkGateway Gateway) (*UserDefinedNetworkGateway, error) {
 	// Generate a per network conntrack mark and masquerade IPs to be used for egress traffic.
@@ -231,6 +229,7 @@ func NewUserDefinedNetworkGateway(netInfo util.NetInfo, networkID int, node *cor
 		v6MasqIPs *udn.MasqueradeIPs
 		err       error
 	)
+	networkID := netInfo.GetNetworkID()
 	masqCTMark := ctMarkUDNBase + uint(networkID)
 	pktMark := pktMarkBase + uint(networkID)
 	if config.IPv4Mode {
@@ -253,7 +252,6 @@ func NewUserDefinedNetworkGateway(netInfo util.NetInfo, networkID int, node *cor
 
 	return &UserDefinedNetworkGateway{
 		NetInfo:       netInfo,
-		networkID:     networkID,
 		node:          node,
 		nodeLister:    nodeLister,
 		kubeInterface: kubeInterface,
@@ -347,7 +345,7 @@ func (udng *UserDefinedNetworkGateway) AddNetwork() error {
 		return fmt.Errorf("failed to update IP rules for network %s: %w", udng.GetNetworkName(), err)
 	}
 	// add loose mode for rp filter on management port
-	mgmtPortName := util.GetNetworkScopedK8sMgmtHostIntfName(uint(udng.networkID))
+	mgmtPortName := util.GetNetworkScopedK8sMgmtHostIntfName(uint(udng.GetNetworkID()))
 	if err := addRPFilterLooseModeForManagementPort(mgmtPortName); err != nil {
 		return fmt.Errorf("could not set loose mode for reverse path filtering on management port %s: %v", mgmtPortName, err)
 	}
@@ -399,7 +397,7 @@ func (udng *UserDefinedNetworkGateway) AddNetwork() error {
 }
 
 func (udng *UserDefinedNetworkGateway) GetNetworkRuleMetadata() string {
-	return fmt.Sprintf("%s-%d", udng.GetNetworkName(), udng.networkID)
+	return fmt.Sprintf("%s-%d", udng.GetNetworkName(), udng.GetNetworkID())
 }
 
 // DelNetwork will be responsible to remove all plumbings
@@ -437,7 +435,7 @@ func (udng *UserDefinedNetworkGateway) DelNetwork() error {
 // Returns a netlink Link which is the UDN management port interface along with its MAC address
 func (udng *UserDefinedNetworkGateway) addUDNManagementPort() (netlink.Link, error) {
 	var err error
-	interfaceName := util.GetNetworkScopedK8sMgmtHostIntfName(uint(udng.networkID))
+	interfaceName := util.GetNetworkScopedK8sMgmtHostIntfName(uint(udng.GetNetworkID()))
 	networkLocalSubnets, err := udng.getLocalSubnets()
 	if err != nil {
 		return nil, err
@@ -532,7 +530,7 @@ func (udng *UserDefinedNetworkGateway) addUDNManagementPortIPs(mpLink netlink.Li
 // STEP2: deletes the mac address from the annotation
 func (udng *UserDefinedNetworkGateway) deleteUDNManagementPort() error {
 	var err error
-	interfaceName := util.GetNetworkScopedK8sMgmtHostIntfName(uint(udng.networkID))
+	interfaceName := util.GetNetworkScopedK8sMgmtHostIntfName(uint(udng.GetNetworkID()))
 	// STEP1
 	stdout, stderr, err := util.RunOVSVsctl(
 		"--", "--if-exists", "del-port", "br-int", interfaceName,
@@ -673,7 +671,7 @@ func (udng *UserDefinedNetworkGateway) getV4MasqueradeIP() (*net.IPNet, error) {
 	if !config.IPv4Mode {
 		return nil, nil
 	}
-	masqIPs, err := udn.AllocateV4MasqueradeIPs(udng.networkID)
+	masqIPs, err := udn.AllocateV4MasqueradeIPs(udng.GetNetworkID())
 	if err != nil {
 		return nil, fmt.Errorf("failed to allocate masquerade IPs for v4 stack for network %s: %w", udng.GetNetworkName(), err)
 	}
@@ -685,7 +683,7 @@ func (udng *UserDefinedNetworkGateway) getV6MasqueradeIP() (*net.IPNet, error) {
 	if !config.IPv6Mode {
 		return nil, nil
 	}
-	masqIPs, err := udn.AllocateV6MasqueradeIPs(udng.networkID)
+	masqIPs, err := udn.AllocateV6MasqueradeIPs(udng.GetNetworkID())
 	if err != nil {
 		return nil, fmt.Errorf("failed to allocate masquerade IPs for v6 stack for network %s: %w", udng.GetNetworkName(), err)
 	}
@@ -856,7 +854,7 @@ func (udng *UserDefinedNetworkGateway) doReconcile() error {
 // updateUDNVRFIPRule updates IP rules for a network depending on whether the
 // network is advertised or not
 func (udng *UserDefinedNetworkGateway) updateUDNVRFIPRule() error {
-	interfaceName := util.GetNetworkScopedK8sMgmtHostIntfName(uint(udng.networkID))
+	interfaceName := util.GetNetworkScopedK8sMgmtHostIntfName(uint(udng.GetNetworkID()))
 	mplink, err := util.LinkByName(interfaceName)
 	if err != nil {
 		return fmt.Errorf("unable to get link for %s, error: %v", interfaceName, err)

go-controller/pkg/node/gateway_udn_test.go

@@ -386,9 +386,10 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 		}
 		nad := ovntest.GenerateNAD(netName, "rednad", "greenamespace",
 			types.Layer3Topology, "100.128.0.0/16/24,ae70::/60/64", types.NetworkRolePrimary)
+		ovntest.AnnotateNADWithNetworkID(netID, nad)
 		netInfo, err := util.ParseNADInfo(nad)
 		Expect(err).NotTo(HaveOccurred())
-		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, 3, node, factoryMock.NodeCoreInformer().Lister(),
+		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, node, factoryMock.NodeCoreInformer().Lister(),
 			&kubeMock, vrf, nil, &gateway{})
 		Expect(err).NotTo(HaveOccurred())
 		_, ipNet, err := net.ParseCIDR(v4NodeSubnet)
@@ -430,9 +431,10 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 		// must be defined so that the primary user defined network can match the ip families of the underlying cluster
 		config.IPv4Mode = true
 		config.IPv6Mode = true
+		ovntest.AnnotateNADWithNetworkID(netID, nad)
 		netInfo, err := util.ParseNADInfo(nad)
 		Expect(err).NotTo(HaveOccurred())
-		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, 3, node, factoryMock.NodeCoreInformer().Lister(),
+		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, node, factoryMock.NodeCoreInformer().Lister(),
 			&kubeMock, vrf, nil, &gateway{})
 		Expect(err).NotTo(HaveOccurred())
 		getDeletionFakeOVSCommands(fexec, mgtPort)
@@ -461,9 +463,10 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 		}
 		nad := ovntest.GenerateNAD(netName, "rednad", "greenamespace",
 			types.Layer2Topology, "100.128.0.0/16,ae70::/60", types.NetworkRolePrimary)
+		ovntest.AnnotateNADWithNetworkID(netID, nad)
 		netInfo, err := util.ParseNADInfo(nad)
 		Expect(err).NotTo(HaveOccurred())
-		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, 3, node, factoryMock.NodeCoreInformer().Lister(),
+		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, node, factoryMock.NodeCoreInformer().Lister(),
 			&kubeMock, vrf, nil, &gateway{})
 		Expect(err).NotTo(HaveOccurred())
 		_, ipNet, err := net.ParseCIDR(v4NodeSubnet)
@@ -504,9 +507,10 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 		// must be defined so that the primary user defined network can match the ip families of the underlying cluster
 		config.IPv4Mode = true
 		config.IPv6Mode = true
+		ovntest.AnnotateNADWithNetworkID(netID, nad)
 		netInfo, err := util.ParseNADInfo(nad)
 		Expect(err).NotTo(HaveOccurred())
-		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, 3, node, factoryMock.NodeCoreInformer().Lister(),
+		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, node, factoryMock.NodeCoreInformer().Lister(),
 			&kubeMock, vrf, nil, &gateway{})
 		Expect(err).NotTo(HaveOccurred())
 		getDeletionFakeOVSCommands(fexec, mgtPort)
@@ -544,6 +548,7 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 		}
 		nad := ovntest.GenerateNAD(netName, "rednad", "greenamespace",
 			types.Layer3Topology, "100.128.0.0/16/24,ae70::/60/64", types.NetworkRolePrimary)
+		ovntest.AnnotateNADWithNetworkID(netID, nad)
 		netInfo, err := util.ParseNADInfo(nad)
 		Expect(err).NotTo(HaveOccurred())
 		setUpGatewayFakeOVSCommands(fexec)
@@ -656,7 +661,7 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 			err = localGw.initFunc()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(localGw.Init(stop, wg)).To(Succeed())
-			udnGateway, err := NewUserDefinedNetworkGateway(netInfo, 3, node, wf.NodeCoreInformer().Lister(),
+			udnGateway, err := NewUserDefinedNetworkGateway(netInfo, node, wf.NodeCoreInformer().Lister(),
 				&kubeMock, vrf, ipRulesManager, localGw)
 			Expect(err).NotTo(HaveOccurred())
 			// we cannot start the shared gw directly because it will spawn a goroutine that may not be bound to the test netns
@@ -768,6 +773,7 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 		}
 		nad := ovntest.GenerateNAD(netName, "rednad", "greenamespace",
 			types.Layer2Topology, "100.128.0.0/16,ae70::/64", types.NetworkRolePrimary)
+		ovntest.AnnotateNADWithNetworkID(netID, nad)
 		netInfo, err := util.ParseNADInfo(nad)
 		Expect(err).NotTo(HaveOccurred())
 		_, ipNet, err := net.ParseCIDR(v4NodeSubnet)
@@ -881,7 +887,7 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 			wg := &sync.WaitGroup{}
 			Expect(localGw.initFunc()).To(Succeed())
 			Expect(localGw.Init(stop, wg)).To(Succeed())
-			udnGateway, err := NewUserDefinedNetworkGateway(netInfo, 3, node, wf.NodeCoreInformer().Lister(),
+			udnGateway, err := NewUserDefinedNetworkGateway(netInfo, node, wf.NodeCoreInformer().Lister(),
 				&kubeMock, vrf, ipRulesManager, localGw)
 			Expect(err).NotTo(HaveOccurred())
 			// we cannot start the shared gw directly because it will spawn a goroutine that may not be bound to the test netns
@@ -984,9 +990,10 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 		}
 		nad := ovntest.GenerateNAD(netName, "rednad", "greenamespace",
 			types.Layer3Topology, "100.128.0.0/16/24,ae70::/60/64", types.NetworkRolePrimary)
+		ovntest.AnnotateNADWithNetworkID(netID, nad)
 		netInfo, err := util.ParseNADInfo(nad)
 		Expect(err).NotTo(HaveOccurred())
-		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, 3, node, nil, nil, vrf, nil, &gateway{})
+		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, node, nil, nil, vrf, nil, &gateway{})
 		Expect(err).NotTo(HaveOccurred())
 		getVRFCreationFakeOVSCommands(fexec)
 		err = testNS.Do(func(ns.NetNS) error {
@@ -1052,9 +1059,10 @@ var _ = Describe("UserDefinedNetworkGateway", func() {
 		}
 		nad := ovntest.GenerateNAD(netName, "rednad", "greenamespace",
 			types.Layer3Topology, "100.128.0.0/16/24,ae70::/60/64", types.NetworkRolePrimary)
+		ovntest.AnnotateNADWithNetworkID(netID, nad)
 		netInfo, err := util.ParseNADInfo(nad)
 		Expect(err).NotTo(HaveOccurred())
-		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, 3, node, nil, nil, vrf, nil, &gateway{})
+		udnGateway, err := NewUserDefinedNetworkGateway(netInfo, node, nil, nil, vrf, nil, &gateway{})
 		Expect(err).NotTo(HaveOccurred())
 		getVRFCreationFakeOVSCommands(fexec)
 		err = testNS.Do(func(ns.NetNS) error {
@@ -1269,9 +1277,10 @@ func TestConstructUDNVRFIPRules(t *testing.T) {
 			}
 			nad := ovntest.GenerateNAD("bluenet", "rednad", "greenamespace",
 				types.Layer3Topology, cidr, types.NetworkRolePrimary)
+			ovntest.AnnotateNADWithNetworkID("3", nad)
 			netInfo, err := util.ParseNADInfo(nad)
 			g.Expect(err).NotTo(HaveOccurred())
-			udnGateway, err := NewUserDefinedNetworkGateway(netInfo, 3, node, nil, nil, nil, nil, &gateway{})
+			udnGateway, err := NewUserDefinedNetworkGateway(netInfo, node, nil, nil, nil, nil, &gateway{})
 			g.Expect(err).NotTo(HaveOccurred())
 			rules, delRules, err := udnGateway.constructUDNVRFIPRules(test.vrftableID)
 			g.Expect(err).ToNot(HaveOccurred())
@@ -1437,11 +1446,12 @@ func TestConstructUDNVRFIPRulesPodNetworkAdvertised(t *testing.T) {
 			}
 			nad := ovntest.GenerateNAD("bluenet", "rednad", "greenamespace",
 				types.Layer3Topology, cidr, types.NetworkRolePrimary)
+			ovntest.AnnotateNADWithNetworkID("3", nad)
 			netInfo, err := util.ParseNADInfo(nad)
 			g.Expect(err).ToNot(HaveOccurred())
 			mutableNetInfo := util.NewMutableNetInfo(netInfo)
 			mutableNetInfo.SetPodNetworkAdvertisedVRFs(map[string][]string{node.Name: {"bluenet"}})
-			udnGateway, err := NewUserDefinedNetworkGateway(mutableNetInfo, 3, node, nil, nil, nil, nil, &gateway{})
+			udnGateway, err := NewUserDefinedNetworkGateway(mutableNetInfo, node, nil, nil, nil, nil, &gateway{})
 			g.Expect(err).NotTo(HaveOccurred())
 			rules, delRules, err := udnGateway.constructUDNVRFIPRules(test.vrftableID)
 			g.Expect(err).ToNot(HaveOccurred())

go-controller/pkg/node/secondary_node_network_controller.go

@@ -6,7 +6,6 @@ import (
 	"sync"
 
 	"k8s.io/klog/v2"
-	"k8s.io/utils/ptr"
 
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
@@ -22,8 +21,6 @@ type SecondaryNodeNetworkController struct {
 	BaseNodeNetworkController
 	// pod events factory handler
 	podHandler *factory.Handler
-	// stores the networkID of this network
-	networkID *int
 	// responsible for programing gateway elements for this network
 	gateway *UserDefinedNetworkGateway
 }
@@ -53,12 +50,8 @@ func NewSecondaryNodeNetworkController(
 			return nil, fmt.Errorf("error retrieving node %s while creating node network controller for network %s: %v",
 				snnc.name, netInfo.GetNetworkName(), err)
 		}
-		networkID, err := snnc.getNetworkID()
-		if err != nil {
-			return nil, fmt.Errorf("error retrieving network id for network %s: %v", netInfo.GetNetworkName(), err)
-		}
 
-		snnc.gateway, err = NewUserDefinedNetworkGateway(snnc.GetNetInfo(), networkID, node,
+		snnc.gateway, err = NewUserDefinedNetworkGateway(snnc.GetNetInfo(), node,
 			snnc.watchFactory.NodeCoreInformer().Lister(), snnc.Kube, vrfManager, ruleManager, defaultNetworkGateway)
 		if err != nil {
 			return nil, fmt.Errorf("error creating UDN gateway for network %s: %v", netInfo.GetNetworkName(), err)
@@ -107,26 +100,6 @@ func (nc *SecondaryNodeNetworkController) Cleanup() error {
 	return nil
 }
 
-func (oc *SecondaryNodeNetworkController) getNetworkID() (int, error) {
-	if oc.networkID == nil || *oc.networkID == util.InvalidID {
-		oc.networkID = ptr.To(util.InvalidID)
-		if netID := oc.GetNetworkID(); netID != util.InvalidID {
-			*oc.networkID = netID
-			return *oc.networkID, nil
-		}
-
-		nodes, err := oc.watchFactory.GetNodes()
-		if err != nil {
-			return util.InvalidID, err
-		}
-		*oc.networkID, err = util.GetNetworkID(nodes, oc.GetNetInfo())
-		if err != nil {
-			return util.InvalidID, err
-		}
-	}
-	return *oc.networkID, nil
-}
-
 func (oc *SecondaryNodeNetworkController) shouldReconcileNetworkChange(old, new util.NetInfo) bool {
 	wasUDNNetworkAdvertisedAtNode := util.IsPodNetworkAdvertisedAtNode(old, oc.name)
 	isUDNNetworkAdvertisedAtNode := util.IsPodNetworkAdvertisedAtNode(new, oc.name)

go-controller/pkg/node/secondary_node_network_controller_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"strconv"
 	"sync"
 	"time"
 
@@ -14,10 +15,8 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes/fake"
 
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
 	factoryMocks "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory/mocks"
 	kubemocks "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube/mocks"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/node/iprulemanager"
@@ -35,7 +34,8 @@ import (
 
 var _ = Describe("SecondaryNodeNetworkController", func() {
 	var (
-		nad = ovntest.GenerateNAD("bluenet", "rednad", "greenamespace",
+		networkID = "3"
+		nad       = ovntest.GenerateNAD("bluenet", "rednad", "greenamespace",
 			types.Layer3Topology, "100.128.0.0/16", types.NetworkRolePrimary)
 		fexec      *ovntest.FakeExec
 		mgtPortMAC string = "00:00:00:55:66:77" // dummy MAC used for fake commands
@@ -49,62 +49,12 @@ var _ = Describe("SecondaryNodeNetworkController", func() {
 		// Set up a fake vsctl command mock interface
 		fexec = ovntest.NewFakeExec()
 		Expect(util.SetExec(fexec)).To(Succeed())
+		ovntest.AnnotateNADWithNetworkID(networkID, nad)
 	})
 	AfterEach(func() {
 		util.ResetRunner()
 	})
 
-	It("should return networkID from one of the nodes in the cluster", func() {
-		fakeClient := &util.OVNNodeClientset{
-			KubeClient: fake.NewSimpleClientset(&corev1.Node{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "worker1",
-					Annotations: map[string]string{
-						"k8s.ovn.org/network-ids": `{"bluenet": "3"}`,
-					},
-				},
-			}),
-		}
-		controller := SecondaryNodeNetworkController{}
-		var err error
-		controller.watchFactory, err = factory.NewNodeWatchFactory(fakeClient, "worker1")
-		Expect(err).NotTo(HaveOccurred())
-		Expect(controller.watchFactory.Start()).To(Succeed())
-
-		netInfo, err := util.ParseNADInfo(nad)
-		Expect(err).NotTo(HaveOccurred())
-		controller.ReconcilableNetInfo = util.NewReconcilableNetInfo(netInfo)
-
-		networkID, err := controller.getNetworkID()
-		Expect(err).ToNot(HaveOccurred())
-		Expect(networkID).To(Equal(3))
-	})
-
-	It("should return invalid networkID if network not found", func() {
-		fakeClient := &util.OVNNodeClientset{
-			KubeClient: fake.NewSimpleClientset(&corev1.Node{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "worker1",
-					Annotations: map[string]string{
-						"k8s.ovn.org/network-ids": `{"othernet": "3"}`,
-					},
-				},
-			}),
-		}
-		controller := SecondaryNodeNetworkController{}
-		var err error
-		controller.watchFactory, err = factory.NewNodeWatchFactory(fakeClient, "worker1")
-		Expect(err).NotTo(HaveOccurred())
-		Expect(controller.watchFactory.Start()).To(Succeed())
-
-		netInfo, err := util.ParseNADInfo(nad)
-		Expect(err).NotTo(HaveOccurred())
-		controller.ReconcilableNetInfo = util.NewReconcilableNetInfo(netInfo)
-
-		networkID, err := controller.getNetworkID()
-		Expect(err).To(HaveOccurred())
-		Expect(networkID).To(Equal(util.InvalidID))
-	})
 	It("ensure UDNGateway is not invoked when feature gate is OFF", func() {
 		config.OVNKubernetesFeature.EnableNetworkSegmentation = false
 		config.OVNKubernetesFeature.EnableMultiNetwork = true
@@ -322,6 +272,7 @@ var _ = Describe("SecondaryNodeNetworkController: UserDefinedPrimaryNetwork Gate
 		By("creating NAD for primary UDN")
 		nad = ovntest.GenerateNAD("bluenet", "rednad", "greenamespace",
 			types.Layer3Topology, "100.128.0.0/16", types.NetworkRolePrimary)
+		ovntest.AnnotateNADWithNetworkID(strconv.Itoa(netID), nad)
 		NetInfo, err := util.ParseNADInfo(nad)
 		Expect(err).NotTo(HaveOccurred())
 		_, ipNet, err := net.ParseCIDR(v4NodeSubnet)

go-controller/pkg/ovn/base_network_controller.go

@@ -247,8 +247,6 @@ func (oc *BaseNetworkController) reconcile(netInfo util.NetInfo, setNodeFailed f
 type BaseSecondaryNetworkController struct {
 	BaseNetworkController
 
-	networkID *int
-
 	// network policy events factory handler
 	netPolicyHandler *factory.Handler
 	// multi-network policy events factory handler