Merge pull request #2891 from arkodg/bump_v19.03

[19.03 backport] Remove hardcoded IPAM config subnet value for ingress network
moby · Sep 17, 2019 · f35d910 · f35d910
2 parents bbe3418 + 9b09fa7
commit f35d910
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/manager/manager.go b/manager/manager.go
@@ -1224,12 +1224,8 @@ func newIngressNetwork() *api.Network {
 			},
 			DriverConfig: &api.Driver{},
 			IPAM: &api.IPAMOptions{
-				Driver: &api.Driver{},
-				Configs: []*api.IPAMConfig{
-					{
-						Subnet: "10.255.0.0/16",
-					},
-				},
+				Driver:  &api.Driver{},
+				Configs: []*api.IPAMConfig{},
 			},
 		},
 	}