Skip to content

Commit 6395072

Browse files
npinaevanpinaeva
committed
[gateway] rename GatewayConfig config to annoConfig
Signed-off-by: Nadia Pinaeva <[email protected]>
1 parent 0473203 commit 6395072

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ func (gw *GatewayManager) gatewayInit(
833833
}
834834
}
835835

836-
gwRouter, err := gw.createGWRouter(gwConfig.config, gwConfig.gwLRPJoinIPs)
836+
gwRouter, err := gw.createGWRouter(gwConfig.annoConfig, gwConfig.gwLRPJoinIPs)
837837
if err != nil {
838838
return err
839839
}
@@ -848,22 +848,22 @@ func (gw *GatewayManager) gatewayInit(
848848
}
849849

850850
if err := gw.addExternalSwitch("",
851-
gwConfig.config.InterfaceID,
851+
gwConfig.annoConfig.InterfaceID,
852852
gw.gwRouterName,
853-
gwConfig.config.MACAddress.String(),
853+
gwConfig.annoConfig.MACAddress.String(),
854854
physNetName(gw.netInfo),
855-
gwConfig.config.IPAddresses,
856-
gwConfig.config.VLANID); err != nil {
855+
gwConfig.annoConfig.IPAddresses,
856+
gwConfig.annoConfig.VLANID); err != nil {
857857
return err
858858
}
859859

860-
if gwConfig.config.EgressGWInterfaceID != "" {
860+
if gwConfig.annoConfig.EgressGWInterfaceID != "" {
861861
if err := gw.addExternalSwitch(types.EgressGWSwitchPrefix,
862-
gwConfig.config.EgressGWInterfaceID,
862+
gwConfig.annoConfig.EgressGWInterfaceID,
863863
gw.gwRouterName,
864-
gwConfig.config.EgressGWMACAddress.String(),
864+
gwConfig.annoConfig.EgressGWMACAddress.String(),
865865
types.PhysicalNetworkExGwName,
866-
gwConfig.config.EgressGWIPAddresses,
866+
gwConfig.annoConfig.EgressGWIPAddresses,
867867
nil); err != nil {
868868
return err
869869
}
@@ -879,7 +879,7 @@ func (gw *GatewayManager) gatewayInit(
879879
}
880880

881881
externalRouterPort := types.GWRouterToExtSwitchPrefix + gw.gwRouterName
882-
if err = gw.updateGWRouterStaticRoutes(gwConfig.clusterSubnets, gwConfig.ovnClusterLRPToJoinIfAddrs, gwConfig.config, externalRouterPort,
882+
if err = gw.updateGWRouterStaticRoutes(gwConfig.clusterSubnets, gwConfig.ovnClusterLRPToJoinIfAddrs, gwConfig.annoConfig, externalRouterPort,
883883
gwRouter); err != nil {
884884
return err
885885
}
@@ -892,7 +892,7 @@ func (gw *GatewayManager) gatewayInit(
892892
return err
893893
}
894894

895-
if err = gw.updateGWRouterNAT(nodeName, gwConfig.clusterSubnets, gwConfig.config, gwConfig.externalIPs, gwLRPIPs, gwRouter); err != nil {
895+
if err = gw.updateGWRouterNAT(nodeName, gwConfig.clusterSubnets, gwConfig.annoConfig, gwConfig.externalIPs, gwLRPIPs, gwRouter); err != nil {
896896
return err
897897
}
898898

@@ -1331,7 +1331,7 @@ func (gw *GatewayManager) SyncGateway(
13311331
node *corev1.Node,
13321332
gwConfig *GatewayConfig,
13331333
) error {
1334-
if gwConfig.config.Mode == config.GatewayModeDisabled {
1334+
if gwConfig.annoConfig.Mode == config.GatewayModeDisabled {
13351335
if err := gw.Cleanup(); err != nil {
13361336
return fmt.Errorf("error cleaning up gateway for node %s: %v", node.Name, err)
13371337
}
@@ -1361,7 +1361,7 @@ func (gw *GatewayManager) SyncGateway(
13611361
if mgmtIfAddr == nil {
13621362
return fmt.Errorf("management interface address not found for subnet %q on network %q", subnet, gw.netInfo.GetNetworkName())
13631363
}
1364-
l3GatewayConfigIP, err := util.MatchFirstIPNetFamily(utilnet.IsIPv6(mgmtIfAddr.IP), gwConfig.config.IPAddresses)
1364+
l3GatewayConfigIP, err := util.MatchFirstIPNetFamily(utilnet.IsIPv6(mgmtIfAddr.IP), gwConfig.annoConfig.IPAddresses)
13651365
if err != nil {
13661366
return fmt.Errorf("failed to extract the gateway IP addr for network %q: %v", gw.netInfo.GetNetworkName(), err)
13671367
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
465465
NodePortEnable: true,
466466
}
467467
gwConfig := &GatewayConfig{
468-
config: l3GatewayConfig,
468+
annoConfig: l3GatewayConfig,
469469
hostSubnets: hostSubnets,
470470
clusterSubnets: clusterIPSubnets,
471471
gwLRPJoinIPs: joinLRPIPs,
@@ -582,7 +582,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
582582
NodePortEnable: true,
583583
}
584584
gwConfig := &GatewayConfig{
585-
config: l3GatewayConfig,
585+
annoConfig: l3GatewayConfig,
586586
hostSubnets: hostSubnets,
587587
clusterSubnets: clusterIPSubnets,
588588
gwLRPJoinIPs: joinLRPIPs,
@@ -705,7 +705,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
705705
NodePortEnable: true,
706706
}
707707
gwConfig := &GatewayConfig{
708-
config: l3GatewayConfig,
708+
annoConfig: l3GatewayConfig,
709709
hostSubnets: hostSubnets,
710710
clusterSubnets: clusterIPSubnets,
711711
gwLRPJoinIPs: joinLRPIPs,
@@ -794,7 +794,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
794794
NodePortEnable: true,
795795
}
796796
gwConfig := &GatewayConfig{
797-
config: l3GatewayConfig,
797+
annoConfig: l3GatewayConfig,
798798
hostSubnets: hostSubnets,
799799
clusterSubnets: clusterIPSubnets,
800800
gwLRPJoinIPs: joinLRPIPs,
@@ -876,7 +876,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
876876
NodePortEnable: true,
877877
}
878878
gwConfig := &GatewayConfig{
879-
config: l3GatewayConfig,
879+
annoConfig: l3GatewayConfig,
880880
hostSubnets: hostSubnets,
881881
clusterSubnets: clusterIPSubnets,
882882
gwLRPJoinIPs: joinLRPIPs,
@@ -972,7 +972,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
972972
NodePortEnable: true,
973973
}
974974
gwConfig := &GatewayConfig{
975-
config: l3GatewayConfig,
975+
annoConfig: l3GatewayConfig,
976976
hostSubnets: hostSubnets,
977977
clusterSubnets: clusterIPSubnets,
978978
gwLRPJoinIPs: joinLRPIPs,
@@ -1082,7 +1082,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
10821082
NodePortEnable: true,
10831083
}
10841084
gwConfig := &GatewayConfig{
1085-
config: l3GatewayConfig,
1085+
annoConfig: l3GatewayConfig,
10861086
hostSubnets: hostSubnets,
10871087
clusterSubnets: clusterIPSubnets,
10881088
gwLRPJoinIPs: joinLRPIPs,
@@ -1162,7 +1162,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
11621162
NodePortEnable: true,
11631163
}
11641164
gwConfig := &GatewayConfig{
1165-
config: l3GatewayConfig,
1165+
annoConfig: l3GatewayConfig,
11661166
hostSubnets: hostSubnets,
11671167
clusterSubnets: clusterIPSubnets,
11681168
gwLRPJoinIPs: joinLRPIPs,
@@ -1249,7 +1249,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
12491249
NodePortEnable: true,
12501250
}
12511251
gwConfig := &GatewayConfig{
1252-
config: l3GatewayConfig,
1252+
annoConfig: l3GatewayConfig,
12531253
hostSubnets: hostSubnets,
12541254
clusterSubnets: clusterIPSubnets,
12551255
gwLRPJoinIPs: joinLRPIPs,
@@ -1330,7 +1330,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
13301330
NodePortEnable: true,
13311331
}
13321332
gwConfig := &GatewayConfig{
1333-
config: l3GatewayConfig,
1333+
annoConfig: l3GatewayConfig,
13341334
hostSubnets: hostSubnets,
13351335
clusterSubnets: clusterIPSubnets,
13361336
gwLRPJoinIPs: joinLRPIPs,
@@ -1444,7 +1444,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
14441444
NodePortEnable: true,
14451445
}
14461446
gwConfig := &GatewayConfig{
1447-
config: l3GatewayConfig,
1447+
annoConfig: l3GatewayConfig,
14481448
hostSubnets: hostSubnets,
14491449
clusterSubnets: clusterIPSubnets,
14501450
gwLRPJoinIPs: joinLRPIPs,
@@ -1561,7 +1561,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
15611561
NodePortEnable: true,
15621562
}
15631563
gwConfig := &GatewayConfig{
1564-
config: l3GatewayConfig,
1564+
annoConfig: l3GatewayConfig,
15651565
hostSubnets: hostSubnets,
15661566
clusterSubnets: clusterIPSubnets,
15671567
gwLRPJoinIPs: joinLRPIPs,
@@ -1651,7 +1651,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
16511651
NodePortEnable: true,
16521652
}
16531653
gwConfig := &GatewayConfig{
1654-
config: l3GatewayConfig,
1654+
annoConfig: l3GatewayConfig,
16551655
hostSubnets: hostSubnets,
16561656
clusterSubnets: clusterIPSubnets,
16571657
gwLRPJoinIPs: joinLRPIPs,
@@ -1770,7 +1770,7 @@ var _ = ginkgo.Describe("Gateway Init Operations", func() {
17701770
NodePortEnable: true,
17711771
}
17721772
gwConfig := &GatewayConfig{
1773-
config: l3GatewayConfig,
1773+
annoConfig: l3GatewayConfig,
17741774
hostSubnets: hostSubnets,
17751775
clusterSubnets: clusterIPSubnets,
17761776
gwLRPJoinIPs: joinLRPIPs,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const (
3434
)
3535

3636
type GatewayConfig struct {
37-
config *util.L3GatewayConfig
37+
annoConfig *util.L3GatewayConfig
3838
hostSubnets []*net.IPNet
3939
clusterSubnets []*net.IPNet
4040
gwLRPJoinIPs []*net.IPNet
@@ -135,7 +135,7 @@ func (oc *DefaultNetworkController) nodeGatewayConfig(node *corev1.Node) (*Gatew
135135
}
136136

137137
return &GatewayConfig{
138-
config: l3GatewayConfig,
138+
annoConfig: l3GatewayConfig,
139139
hostSubnets: hostSubnets,
140140
clusterSubnets: clusterSubnets,
141141
gwLRPJoinIPs: gwLRPIPs,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ func (oc *SecondaryLayer2NetworkController) nodeGatewayConfig(node *corev1.Node)
830830
// Overwrite the primary interface ID with the correct, per-network one.
831831
l3GatewayConfig.InterfaceID = oc.GetNetworkScopedExtPortName(l3GatewayConfig.BridgeID, node.Name)
832832
return &GatewayConfig{
833-
config: l3GatewayConfig,
833+
annoConfig: l3GatewayConfig,
834834
hostSubnets: hostSubnets,
835835
clusterSubnets: hostSubnets,
836836
gwLRPJoinIPs: gwLRPJoinIPs,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ func (oc *SecondaryLayer3NetworkController) nodeGatewayConfig(node *corev1.Node)
10901090
l3GatewayConfig.InterfaceID = oc.GetNetworkScopedExtPortName(l3GatewayConfig.BridgeID, node.Name)
10911091

10921092
return &GatewayConfig{
1093-
config: l3GatewayConfig,
1093+
annoConfig: l3GatewayConfig,
10941094
hostSubnets: hostSubnets,
10951095
clusterSubnets: clusterSubnets,
10961096
gwLRPJoinIPs: gwLRPJoinIPs,

0 commit comments

Comments
 (0)