ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

dhcp: Add priority option to dhcp.

Browse Source 
Currently, we can not set the metric of routes in dhcp.
It's ok if there is only a network interface.

But if there are multiple network interfaces, and both have a default route,
We need to set the metric of the route to make the traffic
go through the correct network interface.

For host-local and static, we can set the metric with the route.priority option.
But there is no such option for dhcp.

Signed-off-by: Songmin Li <lisongmin@protonmail.com>
This commit is contained in:
Songmin Li 2024-09-14 18:21:24 +08:00 committed by Casey Callendrello
parent 03712a572b
commit cc8b1bd80c
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/ipam/ipam_linux.go
View File

@ -117,6 +117,7 @@ func ConfigureIface(ifName string, res *current.Result) error {
Dst: &r.Dst, Dst: &r.Dst,
LinkIndex: link.Attrs().Index, LinkIndex: link.Attrs().Index,
Gw: gw, Gw: gw,
Priority: r.Priority,
} }
if r.Table != nil { if r.Table != nil {
@ -128,7 +129,7 @@ func ConfigureIface(ifName string, res *current.Result) error {
} }
if err = netlink.RouteAddEcmp(&route); err != nil { if err = netlink.RouteAddEcmp(&route); err != nil {
return fmt.Errorf("failed to add route '%v via %v dev %v (Scope: %v, Table: %d)': %v", r.Dst, gw, ifName, route.Scope, route.Table, err) return fmt.Errorf("failed to add route '%v via %v dev %v metric %d (Scope: %v, Table: %d)': %v", r.Dst, gw, ifName, r.Priority, route.Scope, route.Table, err)
} }
} }

5
plugins/ipam/dhcp/daemon.go
View File

@ -109,6 +109,11 @@ func (d *DHCP) Allocate(args *skel.CmdArgs, result *current.Result) error {
Gateway: l.Gateway(), Gateway: l.Gateway(),
}} }}
result.Routes = l.Routes() result.Routes = l.Routes()
if conf.IPAM.Priority != 0 {
for _, r := range result.Routes {
r.Priority = conf.IPAM.Priority
}
}
return nil return nil
} }

2
plugins/ipam/dhcp/main.go
View File

@ -51,6 +51,8 @@ type IPAMConfig struct {
// To override default requesting fields, set `skipDefault` to `false`. // To override default requesting fields, set `skipDefault` to `false`.
// If an field is not optional, but the server failed to provide it, error will be raised. // If an field is not optional, but the server failed to provide it, error will be raised.
RequestOptions []RequestOption `json:"request"` RequestOptions []RequestOption `json:"request"`
// The metric of routes
Priority int `json:"priority,omitempty"`
} }
// DHCPOption represents a DHCP option. It can be a number, or a string defined in manual dhcp-options(5). // DHCPOption represents a DHCP option. It can be a number, or a string defined in manual dhcp-options(5).