cni: Try to enable IPv6 only if necessary

Fixes: cilium#9393 Signed-off-by: Michal Rostecki <[email protected]>
SchSeba · Oct 25, 2019 · a49bf84 · a49bf84
1 parent e943601
commit a49bf84
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/plugins/cilium-cni/cilium-cni.go b/plugins/cilium-cni/cilium-cni.go
@@ -487,8 +487,10 @@ func cmdAdd(args *skel.CmdArgs) (err error) {
 
 	var macAddrStr string
 	if err = netNs.Do(func(_ ns.NetNS) error {
-		if err := sysctl.Disable("net.ipv6.conf.all.disable_ipv6"); err != nil {
-			logger.WithError(err).Warn("unable to enable ipv6 on all interfaces")
+		if ipv6IsEnabled(ipam) {
+			if err := sysctl.Disable("net.ipv6.conf.all.disable_ipv6"); err != nil {
+				logger.WithError(err).Warn("unable to enable ipv6 on all interfaces")
+			}
 		}
 		macAddrStr, err = configureIface(ipam, args.IfName, &state)
 		return err