libnet/ipams/builtin: move to libnet/ipams

Packages in libnet/ipams are drivers, except builtin -- it's used
to register drivers. Move files one level up and delete this pkg.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>

libnetwork/cnmallocator/drivers_ipam.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/libnetwork/ipamapi"
-	builtinIpam "github.com/docker/docker/libnetwork/ipams/builtin"
+	builtinIpam "github.com/docker/docker/libnetwork/ipams"
 	nullIpam "github.com/docker/docker/libnetwork/ipams/null"
 	"github.com/docker/docker/libnetwork/ipamutils"
 	"github.com/moby/swarmkit/v2/manager/allocator/networkallocator"

libnetwork/drivers_ipam.go

@@ -2,7 +2,7 @@ package libnetwork
 
 import (
 	"github.com/docker/docker/libnetwork/ipamapi"
-	builtinIpam "github.com/docker/docker/libnetwork/ipams/builtin"
+	builtinIpam "github.com/docker/docker/libnetwork/ipams"
 	nullIpam "github.com/docker/docker/libnetwork/ipams/null"
 	remoteIpam "github.com/docker/docker/libnetwork/ipams/remote"
 	"github.com/docker/docker/libnetwork/ipamutils"

libnetwork/drvregistry/ipams_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/docker/docker/libnetwork/ipamapi"
-	builtinIpam "github.com/docker/docker/libnetwork/ipams/builtin"
+	builtinIpam "github.com/docker/docker/libnetwork/ipams"
 	nullIpam "github.com/docker/docker/libnetwork/ipams/null"
 	remoteIpam "github.com/docker/docker/libnetwork/ipams/remote"
 	"github.com/docker/docker/libnetwork/ipamutils"

libnetwork/ipams/builtin/builtin.go → libnetwork/ipams/drivers.go

@@ -1,4 +1,4 @@
-package builtin
+package ipams
 
 import (
 	"github.com/docker/docker/libnetwork/ipamapi"

libnetwork/ipams/builtin/builtin_unix.go → libnetwork/ipams/drivers_unix.go

@@ -1,6 +1,6 @@
 //go:build linux || freebsd || darwin
 
-package builtin
+package ipams
 
 import (
 	"github.com/docker/docker/libnetwork/ipamapi"

libnetwork/ipams/builtin/builtin_windows.go → libnetwork/ipams/drivers_windows.go

@@ -1,6 +1,6 @@
 //go:build windows
 
-package builtin
+package ipams
 
 import (
 	"github.com/docker/docker/libnetwork/ipamapi"