Pārlūkot izejas kodu

Merge pull request #29418 from aboch/p66

[1.13.x] Fix buildIpamResources()
Victor Vieux 8 gadi atpakaļ
vecāks
revīzija
4d2be03b68
1 mainītis faili ar 3 papildinājumiem un 0 dzēšanām
  1. 3 0
      api/server/router/network/network_routes.go

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

@@ -259,6 +259,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()