Skip to content

OVN-Interconnect: Only set-up LRP/LSP between the transit switches and default router if we want to. #5834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −19
Open

OVN-Interconnect: Only set-up LRP/LSP between the transit switches and default router if we want to. #5834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions pkg/ovn_ic_controller/ovn_ic_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,13 @@
gwNodes := strings.Split(strings.Trim(config["gw-nodes"], ","), ",")
chassises := make([]string, len(gwNodes))

// Only set up LRPs and LSPs for default router if specified.
var interconnectDefaultRouter = true

Check failure on line 295 in pkg/ovn_ic_controller/ovn_ic_controller.go

View workflow job for this annotation

GitHub Actions / Build kube-ovn 

File is not properly formatted (gofumpt)
val, ok := config["interconnect-default-router"]
if ok && val == "false" {
interconnectDefaultRouter = false
}
Comment on lines +295 to +299
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The logic for parsing the interconnect-default-router boolean flag can be simplified. Instead of initializing the variable and then conditionally changing it, you can determine its value in a single, more idiomatic line. This improves readability and conciseness.

Suggested change
var interconnectDefaultRouter = true
val, ok := config["interconnect-default-router"]
if ok && val == "false" {
interconnectDefaultRouter = false
}
interconnectDefaultRouter := config["interconnect-default-router"] != "false"


for i, tsName := range tsNames {
gwNodesOrdered := generateNewOrderGwNodes(gwNodes, i)
for j, gw := range gwNodesOrdered {
Expand All @@ -317,27 +324,29 @@
}
}

tsPort := fmt.Sprintf("%s-%s", tsName, config["az-name"])
exist, err := c.OVNNbClient.LogicalSwitchPortExists(tsPort)
if err != nil {
klog.Errorf("failed to check logical switch port %q: %v", tsPort, err)
return err
}
if exist {
klog.Infof("ts port %s already exists", tsPort)
continue
}
if interconnectDefaultRouter {
tsPort := fmt.Sprintf("%s-%s", tsName, config["az-name"])
exist, err := c.OVNNbClient.LogicalSwitchPortExists(tsPort)
if err != nil {
klog.Errorf("failed to check logical switch port %q: %v", tsPort, err)
return err
}
if exist {
klog.Infof("ts port %s already exists", tsPort)
continue
}

lrpAddr, err := c.acquireLrpAddress(tsName)
if err != nil {
klog.Errorf("failed to acquire lrp address for ts %q: %v", tsName, err)
return err
}
lrpAddr, err := c.acquireLrpAddress(tsName)
if err != nil {
klog.Errorf("failed to acquire lrp address for ts %q: %v", tsName, err)
return err
}

lrpName := fmt.Sprintf("%s-%s", config["az-name"], tsName)
if err := c.OVNNbClient.CreateLogicalPatchPort(tsName, c.config.ClusterRouter, tsPort, lrpName, lrpAddr, util.GenerateMac(), chassises...); err != nil {
klog.Errorf("failed to create ovn-ic lrp %q: %v", lrpName, err)
return err
lrpName := fmt.Sprintf("%s-%s", config["az-name"], tsName)
if err := c.OVNNbClient.CreateLogicalPatchPort(tsName, c.config.ClusterRouter, tsPort, lrpName, lrpAddr, util.GenerateMac(), chassises...); err != nil {
klog.Errorf("failed to create ovn-ic lrp %q: %v", lrpName, err)
return err
}
}
}

Expand Down
1 change: 1 addition & 0 deletions yamls/ovn-ic-config.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ data:
ic-sb-port: "6646"
gw-nodes: "{{ gateway_nodes }}"
auto-route: "true"
interconnect-default-router: "true"
Loading