From 758ca586cf5d8cd25e49a1b343ad32c2c8e02af0 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 14 Dec 2016 15:28:58 -0800 Subject: [PATCH] Merge pull request #29418 from aboch/p66 [1.13.x] Fix buildIpamResources() (cherry picked from commit 4d2be03b68dd54d8f2307e8b4178ad8ed8d5d343) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 27498a3c60018ea2880a18beec65710fd27971a7 Component: engine --- components/engine/api/server/router/network/network_routes.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/engine/api/server/router/network/network_routes.go b/components/engine/api/server/router/network/network_routes.go index 05faffddb1..bff3561523 100644 --- a/components/engine/api/server/router/network/network_routes.go +++ b/components/engine/api/server/router/network/network_routes.go @@ -410,6 +410,9 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo) if !hasIpv6Conf { for _, ip6Info := range ipv6Info { + if ip6Info.IPAMData.Pool == nil { + continue + } iData := network.IPAMConfig{} iData.Subnet = ip6Info.IPAMData.Pool.String() iData.Gateway = ip6Info.IPAMData.Gateway.String()