Skip to content

feat(controller): support per-pod NIC granular DHCP control via annotations #6475

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

Merged
oilbeater merged 5 commits into from
Mar 27, 2026
Merged

feat(controller): support per-pod NIC granular DHCP control via annotations #6475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ef857b
feat(controller): support per-pod NIC granular DHCP control via annot…
oilbeater Mar 19, 2026
1d3bf0a
fix(controller): address review issues in per-pod DHCP options
oilbeater Mar 19, 2026
f0594be
fix: self-review fixes for per-pod DHCP options
oilbeater Mar 19, 2026
1358854
refactor(controller): move DHCP options cleanup to LS/LSP deletion li…
oilbeater Mar 26, 2026
e65b5c0
refactor(ovs): encapsulate per-port DHCP operations within LSP lifecycle
oilbeater Mar 27, 2026
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
174 changes: 146 additions & 28 deletions mocks/pkg/ovs/interface.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 2 additions & 22 deletions pkg/controller/gc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,26 +170,6 @@ func (c *Controller) gcLogicalSwitch() error {
}
klog.Infof("finish to gc logical switch")

klog.Infof("start to gc dhcp options")
dhcpOptions, err := c.OVNNbClient.ListDHCPOptions(c.config.EnableExternalVpc, nil)
if err != nil {
klog.Errorf("failed to list dhcp options, %v", err)
return err
}
uuidToDeleteList := []string{}
for _, item := range dhcpOptions {
if len(item.ExternalIDs) == 0 || !subnetNames.Has(item.ExternalIDs["ls"]) {
uuidToDeleteList = append(uuidToDeleteList, item.UUID)
}
}
klog.Infof("gc dhcp options %v", uuidToDeleteList)
if len(uuidToDeleteList) > 0 {
if err = c.OVNNbClient.DeleteDHCPOptionsByUUIDs(uuidToDeleteList...); err != nil {
klog.Errorf("failed to delete dhcp options by uuids, %v", err)
return err
}
}
klog.Infof("finish to gc dhcp options")
return nil
}

Expand Down Expand Up @@ -530,8 +510,8 @@ func (c *Controller) markAndCleanLSP() error {
continue
}

klog.Infof("gc logical switch port %s with uuid %s", lsp.Name, lsp.UUID)
if err := c.OVNNbClient.DeleteLogicalSwitchPortByUUID(lsp.ExternalIDs[ovs.LogicalSwitchKey], lsp.UUID); err != nil {
klog.Infof("gc logical switch port %s", lsp.Name)
if err := c.OVNNbClient.DeleteLogicalSwitchPort(lsp.Name); err != nil {
klog.Errorf("failed to delete lsp %s: %v", lsp.Name, err)
return err
}
Expand Down
Loading
Loading