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, moby/moby#21735, am proposing to move this driver out of experimental. Signed-off-by: Madhu Venugopal <[email protected]>
moby · Jul 12, 2018 · 01f84d5 · 01f84d5
1 parent ccc3a85
commit 01f84d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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"
@@ -14,6 +15,7 @@ func getInitializers(experimental bool) []initializer {
 		{bridge.Init, "bridge"},
 		{host.Init, "host"},
 		{macvlan.Init, "macvlan"},
+		{ipvlan.Init, "ipvlan"},
 		{null.Init, "null"},
 		{remote.Init, "remote"},
 		{overlay.Init, "overlay"},