浏览代码

Merge pull request #2230 from mavenugo/exp-ipv

Moving IPVLAN driver out of experimental
Flavio Crisciani 6 年之前
父节点
当前提交
8e7aead94f
共有 2 个文件被更改,包括 3 次插入14 次删除
  1. 0 9
      libnetwork/drivers_experimental_linux.go
  2. 3 5
      libnetwork/drivers_linux.go

+ 0 - 9
libnetwork/drivers_experimental_linux.go

@@ -1,9 +0,0 @@
-package libnetwork
-
-import "github.com/docker/libnetwork/drivers/ipvlan"
-
-func additionalDrivers() []initializer {
-	return []initializer{
-		{ipvlan.Init, "ipvlan"},
-	}
-}

+ 3 - 5
libnetwork/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
 }