From 58808e7748b1efe5ad4cb89fd2ff7fbfcf7cd3d3 Mon Sep 17 00:00:00 2001 From: Rob Murray Date: Fri, 12 Jul 2024 16:08:34 +0100 Subject: [PATCH] Remove code to update Network.enableIPv6 if false Commit 4b9dc647 (from 2016) added this in response to a review comment, but I don't think it can ever have worked because n.enableIPv6 = netMap["enableIPv6"].(bool), added in 2015, would already have panic'd if the field wasn't stored. In any case, it's no longer needed. Signed-off-by: Rob Murray --- libnetwork/network.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libnetwork/network.go b/libnetwork/network.go index 42040bf803..3b0639553b 100644 --- a/libnetwork/network.go +++ b/libnetwork/network.go @@ -698,10 +698,6 @@ func (n *Network) UnmarshalJSON(b []byte) (err error) { if v, ok := netMap["loadBalancerMode"]; ok { n.loadBalancerMode = v.(string) } - // Reconcile old networks with the recently added `--ipv6` flag - if !n.enableIPv6 { - n.enableIPv6 = len(n.ipamV6Info) > 0 - } return nil }