瀏覽代碼

Merge pull request #33609 from thaJeztah/backport-29418

backport #29418 "Fix buildIpamResources()" to master
Vincent Demeester 8 年之前
父節點
當前提交
c9f26eaaf8
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      api/server/router/network/network_routes.go

+ 3 - 0
api/server/router/network/network_routes.go

@@ -410,6 +410,9 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo)
 
 
 	if !hasIpv6Conf {
 	if !hasIpv6Conf {
 		for _, ip6Info := range ipv6Info {
 		for _, ip6Info := range ipv6Info {
+			if ip6Info.IPAMData.Pool == nil {
+				continue
+			}
 			iData := network.IPAMConfig{}
 			iData := network.IPAMConfig{}
 			iData.Subnet = ip6Info.IPAMData.Pool.String()
 			iData.Subnet = ip6Info.IPAMData.Pool.String()
 			iData.Gateway = ip6Info.IPAMData.Gateway.String()
 			iData.Gateway = ip6Info.IPAMData.Gateway.String()