Remove hardcoded IPAM config subnet value for ingress network

[arkodg]

Fixes: https://docker.atlassian.net/browse/ENGORC-2651

[arkodg]

@dperny is there a simple way to add a test-case inside swarmkit

tested the above code via a integration test in moby

diff --git a/integration/network/service_test.go b/integration/network/service_test.go
index df2404c372..e6d417b0c9 100644
--- a/integration/network/service_test.go
+++ b/integration/network/service_test.go
@@ -417,6 +417,12 @@ func TestServiceWithDefaultAddressPoolInit(t *testing.T) {
        assert.NilError(t, err)
        t.Logf("%s: NetworkInspect: %+v", t.Name(), out)
        assert.Assert(t, len(out.IPAM.Config) > 0)
+       assert.Equal(t, out.IPAM.Config[0].Subnet, "20.20.1.0/24")
+
+       // Also inspect ingress network and make sure its in the same subnet
+       out, err = cli.NetworkInspect(ctx, "ingress", types.NetworkInspectOptions{Verbose: true})
+       assert.NilError(t, err)
+       assert.Assert(t, len(out.IPAM.Config) > 0)
        assert.Equal(t, out.IPAM.Config[0].Subnet, "20.20.0.0/24")
 
        err = cli.ServiceRemove(ctx, serviceID)
diff --git a/vendor/github.com/docker/swarmkit/manager/manager.go b/vendor/github.com/docker/swarmkit/manager/manager.go
index 9112fb2b40..cba72c232f 100644
--- a/vendor/github.com/docker/swarmkit/manager/manager.go
+++ b/vendor/github.com/docker/swarmkit/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{},
                        },
                },
        }

INFO: Testing against a local daemon
=== RUN   TestServiceWithDefaultAddressPoolInit
--- PASS: TestServiceWithDefaultAddressPoolInit (19.97s)
    service_test.go:388: Creating a new daemon at: /go/src/github.com/docker/docker/bundles/test-integration/TestServiceWithDefaultAddressPoolInit
    daemon.go:336: [d4a9620a3ce4f] waiting for daemon to start
    daemon.go:336: [d4a9620a3ce4f] waiting for daemon to start
    daemon.go:364: [d4a9620a3ce4f] daemon started
    service_test.go:418: TestServiceWithDefaultAddressPoolInit: NetworkInspect: {Name:sthiraTestServiceWithDefaultAddressPoolInit ID:olderttt3vm9bkk3tgxg7j7gg Created:2019-09-09 23:59:33.3673397 +0000 UTC Scope:swarm Driver:overlay EnableIPv6:false IPAM:{Driver:default Options:map[] Config:[{Subnet:20.20.1.0/24 IPRange: Gateway:20.20.1.1 AuxAddress:map[]}]} Internal:false Attachable:false Ingress:false ConfigFrom:{Network:} ConfigOnly:false Containers:map[2bc54d98097d2b92a1cece7e0cd5ad882538e3ea523fbb6907b4ce8be80794c2:{Name:TestServiceTestServiceWithDefaultAddressPoolInit.1.pjr1m4aurilg9riercnvspb15 EndpointID:43aa1eeab2312463b8499c565b0d2f3cdccc00853adee66a93b5050f3a42aed8 MacAddress:02:42:14:14:01:03 IPv4Address:20.20.1.3/24 IPv6Address:} lb-sthiraTestServiceWithDefaultAddressPoolInit:{Name:sthiraTestServiceWithDefaultAddressPoolInit-endpoint EndpointID:157075a50f3ff116a0448617f43f3836bbb30507c1786746ebbcc2d6fec02e40 MacAddress:02:42:14:14:01:04 IPv4Address:20.20.1.4/24 IPv6Address:}] Options:map[com.docker.network.driver.overlay.vxlanid_list:4097] Labels:map[] Peers:[{Name:905c0be6043c IP:127.0.0.1}] Services:map[TestServiceTestServiceWithDefaultAddressPoolInit:{VIP:20.20.1.2 Ports:[] LocalLBIndex:256 Tasks:[{Name:TestServiceTestServiceWithDefaultAddressPoolInit.1.pjr1m4aurilg9riercnvspb15 EndpointID:43aa1eeab2312463b8499c565b0d2f3cdccc00853adee66a93b5050f3a42aed8 EndpointIP:20.20.1.3 Info:map[Host IP:127.0.0.1]}]}]}
    daemon.go:472: [d4a9620a3ce4f] Stopping daemon
    daemon.go:307: [d4a9620a3ce4f] exiting daemon
    daemon.go:459: [d4a9620a3ce4f] Daemon stopped
PASS

[codecov]

Codecov Report

Merging #2890 into master will increase coverage by 0.05%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2890      +/-   ##
==========================================
+ Coverage   61.52%   61.57%   +0.05%     
==========================================
  Files         139      139              
  Lines       22616    22613       -3     
==========================================
+ Hits        13914    13924      +10     
+ Misses       7229     7210      -19     
- Partials     1473     1479       +6

[dperny]

There's not going to be a simple way to add a test case. The code passes through too many places. I'm satisfied with the test case from Moby handling this if you are.

Otherwise, LGTM. Glad this is a simple fix.

[arkodg]

sg thanks @dperny
PTAL @mavenugo @thaJeztah @selansen

[selansen]

glad its simple fix. I was pretty sure I noticed we call createINgressnetwork before we do init IPAM. anyways if above test case works with ingress, then it should be good.

[thaJeztah]

@arkodg can you also cherry-pick this to the relevant bump_XX branches in this repository? (before I forget; make sure to use the -s (sign-off) and -x option when cherry-picking (cherry-pick -s -x ...) so that there's a reference to the original commit,