From 218394cada882b7e73cb19dabb4df68cfbea3c9c Mon Sep 17 00:00:00 2001 From: Albin Kerouanton Date: Thu, 18 Apr 2024 10:52:34 +0200 Subject: [PATCH] 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 --- libnetwork/cnmallocator/drivers_ipam.go | 2 +- libnetwork/drivers_ipam.go | 2 +- libnetwork/drvregistry/ipams_test.go | 2 +- libnetwork/ipams/{builtin/builtin.go => drivers.go} | 2 +- libnetwork/ipams/{builtin/builtin_unix.go => drivers_unix.go} | 2 +- .../ipams/{builtin/builtin_windows.go => drivers_windows.go} | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename libnetwork/ipams/{builtin/builtin.go => drivers.go} (98%) rename libnetwork/ipams/{builtin/builtin_unix.go => drivers_unix.go} (95%) rename libnetwork/ipams/{builtin/builtin_windows.go => drivers_windows.go} (96%) diff --git a/libnetwork/cnmallocator/drivers_ipam.go b/libnetwork/cnmallocator/drivers_ipam.go index 0812dde89f..addc0dbb92 100644 --- a/libnetwork/cnmallocator/drivers_ipam.go +++ b/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" diff --git a/libnetwork/drivers_ipam.go b/libnetwork/drivers_ipam.go index cbc6c7fdda..09187b530c 100644 --- a/libnetwork/drivers_ipam.go +++ b/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" diff --git a/libnetwork/drvregistry/ipams_test.go b/libnetwork/drvregistry/ipams_test.go index 84b385b78a..a737d4778e 100644 --- a/libnetwork/drvregistry/ipams_test.go +++ b/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" diff --git a/libnetwork/ipams/builtin/builtin.go b/libnetwork/ipams/drivers.go similarity index 98% rename from libnetwork/ipams/builtin/builtin.go rename to libnetwork/ipams/drivers.go index 8356260abe..fd8f42a00f 100644 --- a/libnetwork/ipams/builtin/builtin.go +++ b/libnetwork/ipams/drivers.go @@ -1,4 +1,4 @@ -package builtin +package ipams import ( "github.com/docker/docker/libnetwork/ipamapi" diff --git a/libnetwork/ipams/builtin/builtin_unix.go b/libnetwork/ipams/drivers_unix.go similarity index 95% rename from libnetwork/ipams/builtin/builtin_unix.go rename to libnetwork/ipams/drivers_unix.go index 8c61d9c82f..0547b144e7 100644 --- a/libnetwork/ipams/builtin/builtin_unix.go +++ b/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" diff --git a/libnetwork/ipams/builtin/builtin_windows.go b/libnetwork/ipams/drivers_windows.go similarity index 96% rename from libnetwork/ipams/builtin/builtin_windows.go rename to libnetwork/ipams/drivers_windows.go index 56bef83fbe..f68c581b24 100644 --- a/libnetwork/ipams/builtin/builtin_windows.go +++ b/libnetwork/ipams/drivers_windows.go @@ -1,6 +1,6 @@ //go:build windows -package builtin +package ipams import ( "github.com/docker/docker/libnetwork/ipamapi"