From 7e0873d723888b5f6be325cc0357951757f2abb6 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Wed, 11 Jul 2018 21:42:01 -0700 Subject: [PATCH 1/2] Moving IPVLAN driver out of experimental IPVLAN driver had been retained in experimental for multiple releases with the requirement to have a proper L3 control-plane (such as BGP) to go along with it which will make this driver much more useful. But based on the community feedback, https://github.com/moby/moby/issues/21735, am proposing to move this driver out of experimental. Signed-off-by: Madhu Venugopal --- drivers_experimental_linux.go | 6 +----- drivers_linux.go | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers_experimental_linux.go b/drivers_experimental_linux.go index 4f540d4a87..ed81818ecb 100644 --- a/drivers_experimental_linux.go +++ b/drivers_experimental_linux.go @@ -1,9 +1,5 @@ package libnetwork -import "github.com/docker/libnetwork/drivers/ipvlan" - func additionalDrivers() []initializer { - return []initializer{ - {ipvlan.Init, "ipvlan"}, - } + return []initializer{} } diff --git a/drivers_linux.go b/drivers_linux.go index c53d516fa6..0462b86e67 100644 --- a/drivers_linux.go +++ b/drivers_linux.go @@ -3,6 +3,7 @@ package libnetwork import ( "github.com/docker/libnetwork/drivers/bridge" "github.com/docker/libnetwork/drivers/host" + "github.com/docker/libnetwork/drivers/ipvlan" "github.com/docker/libnetwork/drivers/macvlan" "github.com/docker/libnetwork/drivers/null" "github.com/docker/libnetwork/drivers/overlay" @@ -13,10 +14,11 @@ func getInitializers(experimental bool) []initializer { in := []initializer{ {bridge.Init, "bridge"}, {host.Init, "host"}, + {ipvlan.Init, "ipvlan"}, {macvlan.Init, "macvlan"}, {null.Init, "null"}, - {remote.Init, "remote"}, {overlay.Init, "overlay"}, + {remote.Init, "remote"}, } if experimental { From 388a43b44221ef685c2f1b2f8273a53b615ca336 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Tue, 25 Sep 2018 10:30:34 -0700 Subject: [PATCH 2/2] Removing experimental driver interface Signed-off-by: Madhu Venugopal --- drivers_experimental_linux.go | 5 ----- drivers_linux.go | 4 ---- 2 files changed, 9 deletions(-) delete mode 100644 drivers_experimental_linux.go diff --git a/drivers_experimental_linux.go b/drivers_experimental_linux.go deleted file mode 100644 index ed81818ecb..0000000000 --- a/drivers_experimental_linux.go +++ /dev/null @@ -1,5 +0,0 @@ -package libnetwork - -func additionalDrivers() []initializer { - return []initializer{} -} diff --git a/drivers_linux.go b/drivers_linux.go index 0462b86e67..452ffca052 100644 --- a/drivers_linux.go +++ b/drivers_linux.go @@ -20,9 +20,5 @@ func getInitializers(experimental bool) []initializer { {overlay.Init, "overlay"}, {remote.Init, "remote"}, } - - if experimental { - in = append(in, additionalDrivers()...) - } return in }