From 999ca15763a00ad9f1e99532e0ddfbd4f64b134e Mon Sep 17 00:00:00 2001 From: Zenghui Shi Date: Tue, 7 Nov 2023 19:43:50 +0800 Subject: [PATCH 1/4] macvlan: enable ipv6 ndisc_notify Signed-off-by: Zenghui Shi --- plugins/main/macvlan/macvlan.go | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go index 435024c49..2fb45b211 100644 --- a/plugins/main/macvlan/macvlan.go +++ b/plugins/main/macvlan/macvlan.go @@ -351,6 +351,7 @@ func cmdAdd(args *skel.CmdArgs) 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/ipv6/conf/%s/ndisc_notify", args.IfName), "1") return ipam.ConfigureIface(args.IfName, result) }) From 8c59fc1eeabcacd042e43c4e6c98b05eb8fc11d6 Mon Sep 17 00:00:00 2001 From: arthur-zhang Date: Mon, 23 Oct 2023 23:20:41 +0800 Subject: [PATCH 2/4] bridge: remove useless check gws.defaultRouteFound here is always false. Signed-off-by: arthur-zhang --- plugins/main/bridge/bridge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go index f4e61c72d..8db99c767 100644 --- a/plugins/main/bridge/bridge.go +++ b/plugins/main/bridge/bridge.go @@ -240,7 +240,7 @@ func calcGateways(result *current.Result, n *NetConf) (*gwInfo, *gwInfo, error) // Add a default route for this family using the current // gateway address if necessary. - if n.IsDefaultGW && !gws.defaultRouteFound { + if n.IsDefaultGW { for _, route := range result.Routes { if route.GW != nil && defaultNet.String() == route.Dst.String() { gws.defaultRouteFound = true From 495a2cbb0cbe9e45ae5240705b4ba9aafea13398 Mon Sep 17 00:00:00 2001 From: arthur-zhang Date: Thu, 26 Oct 2023 10:28:55 +0800 Subject: [PATCH 3/4] bridge: remove useless firstV4Addr Signed-off-by: arthur-zhang --- plugins/main/bridge/bridge.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go index 8db99c767..7a8e7e42a 100644 --- a/plugins/main/bridge/bridge.go +++ b/plugins/main/bridge/bridge.go @@ -629,14 +629,10 @@ func cmdAdd(args *skel.CmdArgs) error { } if n.IsGW { - var firstV4Addr net.IP var vlanInterface *current.Interface // Set the IP address(es) on the bridge and enable forwarding for _, gws := range []*gwInfo{gwsV4, gwsV6} { for _, gw := range gws.gws { - if gw.IP.To4() != nil && firstV4Addr == nil { - firstV4Addr = gw.IP - } if n.Vlan != 0 { vlanIface, err := ensureVlanInterface(br, n.Vlan, n.PreserveDefaultVlan) if err != nil { From 5280b4d5822788cae99d50856ae176e726b072a5 Mon Sep 17 00:00:00 2001 From: arthur-zhang Date: Fri, 27 Oct 2023 22:52:55 +0800 Subject: [PATCH 4/4] bridge: fix spelling Signed-off-by: arthur-zhang --- plugins/main/bridge/bridge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go index 7a8e7e42a..88c5d1a53 100644 --- a/plugins/main/bridge/bridge.go +++ b/plugins/main/bridge/bridge.go @@ -729,7 +729,7 @@ func cmdAdd(args *skel.CmdArgs) error { } // 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) { result.DNS = n.DNS }