Ver código fonte

libnet/ipams: Unconditionally call windowsipam.Register

This function is made a no-op on non-windows platform.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Albin Kerouanton 1 ano atrás
pai
commit
9d26d5cccd

+ 0 - 2
libnetwork/ipams/drivers_windows.go → libnetwork/ipams/drivers.go

@@ -1,5 +1,3 @@
-//go:build windows
-
 package ipams
 
 import (

+ 0 - 14
libnetwork/ipams/drivers_unix.go

@@ -1,14 +0,0 @@
-//go:build linux || freebsd || darwin
-
-package ipams
-
-import (
-	"github.com/docker/docker/libnetwork/ipamapi"
-	"github.com/docker/docker/libnetwork/ipams/defaultipam"
-	"github.com/docker/docker/libnetwork/ipamutils"
-)
-
-// Register registers the built-in ipam service with libnetwork.
-func Register(r ipamapi.Registerer, addressPools []*ipamutils.NetworkToSplit) error {
-	return defaultipam.Register(r, addressPools)
-}

+ 2 - 0
libnetwork/ipams/windowsipam/windowsipam.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package windowsipam
 
 import (

+ 10 - 0
libnetwork/ipams/windowsipam/windowsipam_other.go

@@ -0,0 +1,10 @@
+//go:build !windows
+
+package windowsipam
+
+import "github.com/docker/docker/libnetwork/ipamapi"
+
+// Register is a no-op -- windowsipam is only supported on Windows.
+func Register(_ ipamapi.Registerer) error {
+	return nil
+}

+ 2 - 0
libnetwork/ipams/windowsipam/windowsipam_test.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 package windowsipam
 
 import (