Merge pull request #2230 from mavenugo/exp-ipv

Moving IPVLAN driver out of experimental
moby · Mar 1, 2019 · 8be2d07 · 8be2d07
2 parents 04a014d + 388a43b
commit 8be2d07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/drivers_experimental_linux.go b/drivers_experimental_linux.go
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"
@@ -13,14 +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"},
-	}
-
-	if experimental {
-		in = append(in, additionalDrivers()...)
+		{remote.Init, "remote"},
 	}
 	return in
 }