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

Merge branch 'main' into fix/ndisc_ipvlan

Browse Source
This commit is contained in:
Tomofumi Hayashi 2023-11-14 08:18:07 +09:00 committed by GitHub
commit 00406f9d1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/main/bridge/bridge.go
View File

@ -240,7 +240,7 @@ func calcGateways(result *current.Result, n *NetConf) (*gwInfo, *gwInfo, error)
// Add a default route for this family using the current // Add a default route for this family using the current
// gateway address if necessary. // gateway address if necessary.
if n.IsDefaultGW && !gws.defaultRouteFound { if n.IsDefaultGW {
for _, route := range result.Routes { for _, route := range result.Routes {
if route.GW != nil && defaultNet.String() == route.Dst.String() { if route.GW != nil && defaultNet.String() == route.Dst.String() {
gws.defaultRouteFound = true gws.defaultRouteFound = true
@ -629,14 +629,10 @@ func cmdAdd(args *skel.CmdArgs) error {
} }
if n.IsGW { if n.IsGW {
var firstV4Addr net.IP
var vlanInterface *current.Interface var vlanInterface *current.Interface
// Set the IP address(es) on the bridge and enable forwarding // Set the IP address(es) on the bridge and enable forwarding
for _, gws := range []*gwInfo{gwsV4, gwsV6} { for _, gws := range []*gwInfo{gwsV4, gwsV6} {
for _, gw := range gws.gws { for _, gw := range gws.gws {
if gw.IP.To4() != nil && firstV4Addr == nil {
firstV4Addr = gw.IP
}
if n.Vlan != 0 { if n.Vlan != 0 {
vlanIface, err := ensureVlanInterface(br, n.Vlan, n.PreserveDefaultVlan) vlanIface, err := ensureVlanInterface(br, n.Vlan, n.PreserveDefaultVlan)
if err != nil { if err != nil {
@ -733,7 +729,7 @@ func cmdAdd(args *skel.CmdArgs) error {
} }
// Use incoming DNS settings if provided, otherwise use the // Use incoming DNS settings if provided, otherwise use the
// settings that were already configued by the IPAM plugin // settings that were already configured by the IPAM plugin
if dnsConfSet(n.DNS) { if dnsConfSet(n.DNS) {
result.DNS = n.DNS result.DNS = n.DNS
} }

1
plugins/main/macvlan/macvlan.go
View File

@ -351,6 +351,7 @@ func cmdAdd(args *skel.CmdArgs) error {
err = netns.Do(func(_ ns.NetNS) error { err = netns.Do(func(_ ns.NetNS) error {
_, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1") _, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv4/conf/%s/arp_notify", args.IfName), "1")
_, _ = sysctl.Sysctl(fmt.Sprintf("net/ipv6/conf/%s/ndisc_notify", args.IfName), "1")
return ipam.ConfigureIface(args.IfName, result) return ipam.ConfigureIface(args.IfName, result)
}) })