Skip to content

Commit e427103

Browse files
npinaevanpinaeva
committed
[gateway] rename public and private interfaces.
Squash syncGatewayLogicalNetwork and syncNodeGateway into 1 function SyncGateway. Call SyncGateway from ovn.go since it does config.GatewayModeDisabled check inside. Signed-off-by: Nadia Pinaeva <[email protected]>
1 parent 02c2c18 commit e427103

File tree

5 files changed

+45
-72
lines changed

5 files changed

+45
-72
lines changed

‎go-controller/pkg/ovn/gateway.go‎

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -799,9 +799,9 @@ func (gw *GatewayManager) updateGWRouterNAT(nodeName string, clusterIPSubnet []*
799799
return nil
800800
}
801801

802-
// GatewayInit creates a gateway router for the local chassis.
802+
// gatewayInit creates a gateway router for the local chassis.
803803
// enableGatewayMTU enables options:gateway_mtu for gateway routers.
804-
func (gw *GatewayManager) GatewayInit(
804+
func (gw *GatewayManager) gatewayInit(
805805
nodeName string,
806806
clusterIPSubnet []*net.IPNet,
807807
hostSubnets []*net.IPNet,
@@ -1330,19 +1330,29 @@ func (gw *GatewayManager) isRoutingAdvertised(node string) bool {
13301330
return util.IsPodNetworkAdvertisedAtNode(gw.netInfo, node)
13311331
}
13321332

1333-
func (gw *GatewayManager) syncGatewayLogicalNetwork(
1333+
// SyncGateway ensures a node's gateway router is configured according to the L3 config and host subnets
1334+
func (gw *GatewayManager) SyncGateway(
13341335
node *corev1.Node,
13351336
l3GatewayConfig *util.L3GatewayConfig,
13361337
hostSubnets []*net.IPNet,
13371338
hostAddrs []string,
1338-
clusterSubnets []*net.IPNet,
1339-
grLRPJoinIPs []*net.IPNet,
1339+
clusterSubnets, grLRPJoinIPs []*net.IPNet,
13401340
ovnClusterLRPToJoinIfAddrs []*net.IPNet,
13411341
externalIPs []net.IP,
13421342
) error {
1343+
if l3GatewayConfig.Mode == config.GatewayModeDisabled {
1344+
if err := gw.Cleanup(); err != nil {
1345+
return fmt.Errorf("error cleaning up gateway for node %s: %v", node.Name, err)
1346+
}
1347+
return nil
1348+
}
1349+
if hostSubnets == nil {
1350+
return nil
1351+
}
1352+
13431353
enableGatewayMTU := util.ParseNodeGatewayMTUSupport(node)
13441354

1345-
err := gw.GatewayInit(
1355+
err := gw.gatewayInit(
13461356
node.Name,
13471357
clusterSubnets,
13481358
hostSubnets,
@@ -1388,37 +1398,6 @@ func (gw *GatewayManager) syncGatewayLogicalNetwork(
13881398
return nil
13891399
}
13901400

1391-
// syncNodeGateway ensures a node's gateway router is configured according to the L3 config and host subnets
1392-
func (gw *GatewayManager) syncNodeGateway(
1393-
node *corev1.Node,
1394-
l3GatewayConfig *util.L3GatewayConfig,
1395-
hostSubnets []*net.IPNet,
1396-
hostAddrs []string,
1397-
clusterSubnets, grLRPJoinIPs []*net.IPNet,
1398-
joinSwitchIPs []*net.IPNet,
1399-
externalIPs []net.IP,
1400-
) error {
1401-
if l3GatewayConfig.Mode == config.GatewayModeDisabled {
1402-
if err := gw.Cleanup(); err != nil {
1403-
return fmt.Errorf("error cleaning up gateway for node %s: %v", node.Name, err)
1404-
}
1405-
return nil
1406-
}
1407-
if hostSubnets == nil {
1408-
return nil
1409-
}
1410-
return gw.syncGatewayLogicalNetwork(
1411-
node,
1412-
l3GatewayConfig,
1413-
hostSubnets,
1414-
hostAddrs,
1415-
clusterSubnets,
1416-
grLRPJoinIPs, // the joinIP allocated to this node for this controller's network
1417-
joinSwitchIPs, // the .1 of this controller's global joinSubnet
1418-
externalIPs,
1419-
)
1420-
}
1421-
14221401
func physNetName(netInfo util.NetInfo) string {
14231402
if netInfo.IsDefault() || netInfo.IsPrimaryNetwork() {
14241403
return types.PhysicalNetworkName

‎go-controller/pkg/ovn/gateway_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
469469
fakeOvn.controller.defaultCOPPUUID, err = EnsureDefaultCOPP(fakeOvn.nbClient)
470470
gomega.Expect(err).NotTo(gomega.HaveOccurred())
471471

472-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
472+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
473473
nodeName,
474474
clusterIPSubnets,
475475
hostSubnets,
@@ -582,7 +582,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
582582
fakeOvn.controller.defaultCOPPUUID, err = EnsureDefaultCOPP(fakeOvn.nbClient)
583583
gomega.Expect(err).NotTo(gomega.HaveOccurred())
584584

585-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
585+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
586586
nodeName,
587587
clusterIPSubnets,
588588
hostSubnets,
@@ -701,7 +701,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
701701
fakeOvn.controller.defaultCOPPUUID, err = EnsureDefaultCOPP(fakeOvn.nbClient)
702702
gomega.Expect(err).NotTo(gomega.HaveOccurred())
703703

704-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
704+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
705705
nodeName,
706706
clusterIPSubnets,
707707
hostSubnets,
@@ -786,7 +786,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
786786
fakeOvn.controller.defaultCOPPUUID, err = EnsureDefaultCOPP(fakeOvn.nbClient)
787787
gomega.Expect(err).NotTo(gomega.HaveOccurred())
788788

789-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
789+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
790790
nodeName,
791791
clusterIPSubnets,
792792
hostSubnets,
@@ -871,7 +871,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
871871
mgmtPortIP := ""
872872

873873
// Disable option:gateway_mtu.
874-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
874+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
875875
nodeName,
876876
clusterIPSubnets,
877877
hostSubnets,
@@ -890,7 +890,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
890890

891891
// Enable option:gateway_mtu.
892892
expectedOVNClusterRouter.StaticRoutes = []string{}
893-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
893+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
894894
nodeName,
895895
clusterIPSubnets,
896896
hostSubnets,
@@ -968,7 +968,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
968968
// We don't set up the Allow from mgmt port ACL here
969969
mgmtPortIP := ""
970970

971-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
971+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
972972
nodeName,
973973
clusterIPSubnets,
974974
hostSubnets,
@@ -989,7 +989,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
989989
oldJoinLRPIPs := joinLRPIPs
990990
joinLRPIPs = ovntest.MustParseIPNets("100.64.0.99/16")
991991
expectedOVNClusterRouter.StaticRoutes = []string{}
992-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
992+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
993993
nodeName,
994994
clusterIPSubnets,
995995
hostSubnets,
@@ -1072,7 +1072,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
10721072
fakeOvn.controller.defaultCOPPUUID, err = EnsureDefaultCOPP(fakeOvn.nbClient)
10731073
gomega.Expect(err).NotTo(gomega.HaveOccurred())
10741074

1075-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
1075+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
10761076
nodeName,
10771077
clusterIPSubnets,
10781078
hostSubnets,
@@ -1151,7 +1151,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
11511151
config.IPv4Mode = false
11521152
config.IPv6Mode = true
11531153

1154-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
1154+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
11551155
nodeName,
11561156
clusterIPSubnets,
11571157
hostSubnets,
@@ -1231,7 +1231,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
12311231
fakeOvn.controller.defaultCOPPUUID, err = EnsureDefaultCOPP(fakeOvn.nbClient)
12321232
gomega.Expect(err).NotTo(gomega.HaveOccurred())
12331233

1234-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
1234+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
12351235
nodeName,
12361236
clusterIPSubnets,
12371237
hostSubnets,
@@ -1309,7 +1309,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
13091309
fakeOvn.controller.defaultCOPPUUID, err = EnsureDefaultCOPP(fakeOvn.nbClient)
13101310
gomega.Expect(err).NotTo(gomega.HaveOccurred())
13111311

1312-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
1312+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
13131313
nodeName,
13141314
clusterIPSubnets,
13151315
hostSubnets,
@@ -1419,7 +1419,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
14191419
fakeOvn.controller.defaultCOPPUUID, err = EnsureDefaultCOPP(fakeOvn.nbClient)
14201420
gomega.Expect(err).NotTo(gomega.HaveOccurred())
14211421

1422-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
1422+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
14231423
nodeName,
14241424
clusterIPSubnets,
14251425
hostSubnets,
@@ -1531,7 +1531,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
15311531
fakeOvn.controller.defaultCOPPUUID, err = EnsureDefaultCOPP(fakeOvn.nbClient)
15321532
gomega.Expect(err).NotTo(gomega.HaveOccurred())
15331533

1534-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
1534+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
15351535
nodeName,
15361536
clusterIPSubnets,
15371537
hostSubnets,
@@ -1618,7 +1618,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
16181618
fakeOvn.controller.defaultCOPPUUID, err = EnsureDefaultCOPP(fakeOvn.nbClient)
16191619
gomega.Expect(err).NotTo(gomega.HaveOccurred())
16201620

1621-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
1621+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
16221622
nodeName,
16231623
clusterIPSubnets,
16241624
hostSubnets,
@@ -1734,7 +1734,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
17341734
gomega.Expect(err).NotTo(gomega.HaveOccurred())
17351735

17361736
expectedOVNClusterRouter.StaticRoutes = []string{}
1737-
err = newGatewayManager(fakeOvn, nodeName).GatewayInit(
1737+
err = newGatewayManager(fakeOvn, nodeName).gatewayInit(
17381738
nodeName,
17391739
clusterIPSubnets,
17401740
hostSubnets,

‎go-controller/pkg/ovn/ovn.go‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -379,23 +379,17 @@ func (oc *DefaultNetworkController) syncNodeGateway(node *corev1.Node) error {
379379
return fmt.Errorf("error getting gateway config for node %s: %v", node.Name, err)
380380
}
381381

382-
if gwConfig.config.Mode == config.GatewayModeDisabled {
383-
if err := oc.newGatewayManager(node.Name).Cleanup(); err != nil {
384-
return fmt.Errorf("error cleaning up gateway for node %s: %v", node.Name, err)
385-
}
386-
} else {
387-
if err := oc.newGatewayManager(node.Name).syncGatewayLogicalNetwork(
388-
node,
389-
gwConfig.config,
390-
gwConfig.hostSubnets,
391-
gwConfig.hostAddrs,
392-
gwConfig.clusterSubnets,
393-
gwConfig.gwLRPJoinIPs,
394-
oc.ovnClusterLRPToJoinIfAddrs,
395-
gwConfig.externalIPs,
396-
); err != nil {
397-
return fmt.Errorf("error creating gateway for node %s: %v", node.Name, err)
398-
}
382+
if err := oc.newGatewayManager(node.Name).SyncGateway(
383+
node,
384+
gwConfig.config,
385+
gwConfig.hostSubnets,
386+
gwConfig.hostAddrs,
387+
gwConfig.clusterSubnets,
388+
gwConfig.gwLRPJoinIPs,
389+
oc.ovnClusterLRPToJoinIfAddrs,
390+
gwConfig.externalIPs,
391+
); err != nil {
392+
return fmt.Errorf("error creating gateway for node %s: %v", node.Name, err)
399393
}
400394

401395
if util.IsPodNetworkAdvertisedAtNode(oc, node.Name) {

‎go-controller/pkg/ovn/secondary_layer2_network_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ func (oc *SecondaryLayer2NetworkController) addUpdateLocalNodeEvent(node *corev1
580580
errs = append(errs, err)
581581
oc.gatewaysFailed.Store(node.Name, true)
582582
} else {
583-
if err := gwManager.syncNodeGateway(
583+
if err := gwManager.SyncGateway(
584584
node,
585585
gwConfig.config,
586586
gwConfig.hostSubnets,

‎go-controller/pkg/ovn/secondary_layer3_network_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ func (oc *SecondaryLayer3NetworkController) addUpdateLocalNodeEvent(node *corev1
777777
errs = append(errs, fmt.Errorf("failed to generate node GW configuration: %v", err))
778778
oc.gatewaysFailed.Store(node.Name, true)
779779
} else {
780-
if err := gwManager.syncNodeGateway(
780+
if err := gwManager.SyncGateway(
781781
node,
782782
gwConfig.config,
783783
gwConfig.hostSubnets,

0 commit comments

Comments
 (0)