Remove BridgeIP from ipallocation pool

Closes #9938

Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: f4551b8a48bdc7a135466398eecfb103fcde25c6
Component: engine

components/engine/daemon/networkdriver/bridge/driver.go

@@ -171,6 +171,9 @@ func InitDriver(job *engine.Job) engine.Status {
 		}
 	}
 
+	// Block BridgeIP in IP allocator
+	ipallocator.RequestIP(bridgeNetwork, bridgeNetwork.IP)
+
 	// https://github.com/docker/docker/issues/2768
 	job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", bridgeNetwork.IP)
 

components/engine/daemon/networkdriver/ipallocator/allocator.go

@@ -121,7 +121,6 @@ func (allocated *allocatedMap) checkIP(ip net.IP) (net.IP, error) {
 
 	// Register the IP.
 	allocated.p[ip.String()] = struct{}{}
-	allocated.last.Set(pos)
 
 	return ip, nil
 }