浏览代码

Merge pull request #30633 from vdemeester/29809-fix-network-ipam-configuration-on-master

Follow-up of 29826 Use default driver for IPAM if none
Vincent Demeester 8 年之前
父节点
当前提交
829ea91bd1
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      daemon/cluster/convert/network.go

+ 5 - 1
daemon/cluster/convert/network.go

@@ -186,9 +186,13 @@ func BasicNetworkCreateToGRPC(create basictypes.NetworkCreateRequest) swarmapi.N
 		Attachable:  create.Attachable,
 	}
 	if create.IPAM != nil {
+		driver := create.IPAM.Driver
+		if driver == "" {
+			driver = "default"
+		}
 		ns.IPAM = &swarmapi.IPAMOptions{
 			Driver: &swarmapi.Driver{
-				Name:    create.IPAM.Driver,
+				Name:    driver,
 				Options: create.IPAM.Options,
 			},
 		}