Merge pull request #29416 from aboch/c1.12.x

[1.12.5] Fix buildIpamResources()
2016-12-14 11:22:12 -08:00 · 2016-12-14 11:22:12 -08:00 · 58a51648bd
parent f6fbe58fbe 660154fafa
commit 58a51648bd
1 changed files with 3 additions and 0 deletions
--- a/api/server/router/network/network_routes.go
+++ b/api/server/router/network/network_routes.go
@ -264,6 +264,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()