Commit graph

2840 commits

Author SHA1 Message Date
Akshay
0922883b7e Add a DstStats type to track Destination (real server) stats
Since SvcStats represents the stats for a `Service`, we don't want
to reuse that struct in the `Destination` (for no other reason than
incompatible nomenclature). So this patch adds a `DstStats` struct
to hold the Destination stats.
2018-10-10 13:42:59 -07:00
Akshay
e427c4ee2e Add Stats to the Destination
This patch modifies the `Destination` struct so that the stats for
that destination are also reported.

Signed-off-by: Akshay <akshay.moghe@gmail.com>
2018-10-09 11:53:12 -07:00
Flavio Crisciani
7c3d556f8b Merge pull request #2262 from trilogy-group/increase-dns-max-concurrent
Increase max concurrent requests for DNS from 100 to 1024
2018-10-09 08:02:08 -07:00
Flavio Crisciani
9b39ca36c7 Merge pull request #2272 from johnstep/transparent-network-resiliency
Do not fail with an empty transparent IPv4 address
2018-09-27 14:46:44 -07:00
John Stephens
4fd54c2aea Do not fail with an empty transparent IPv4 address
When dockerd.exe is not stopped cleanly (such as when Windows is
restarted), the endpoints are not cleaned up. When using a transparent
network, the endpoint IPv4 address is blank. When dockerd.exe starts up
again, libnetwork restores the endpoint, which would not have been
stored on a clean shutdown of dockerd.exe. That fails because the IPv4
address is blank. This change warns instead of failing.

Signed-off-by: John Stephens <johnstep@docker.com>
2018-09-27 12:30:37 -07:00
Flavio Crisciani
c58aaf9a42 Merge pull request #2271 from liyongxin/master
typo fix about mismatch
2018-09-27 08:50:58 -07:00
Yongxin Li
619e3d6706 typo fix about mismatch
Signed-off-by: Yongxin Li <yxli@alauda.io>
2018-09-27 20:43:13 +08:00
Madhu Venugopal
08796e04ea Removing experimental driver interface
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2018-09-25 10:30:56 -07:00
Madhu Venugopal
f7b7e74624 Moving IPVLAN driver out of experimental
IPVLAN driver had been retained in experimental for multiple releases
with the requirement to have a proper L3 control-plane (such as BGP) to
go along with it which will make this driver much more useful. But
based on the community feedback,
https://github.com/moby/moby/issues/21735, am proposing to move this
driver out of experimental.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2018-09-25 10:30:56 -07:00
Christopher Adam Telfer
be9fe156d5 Merge pull request #2248 from AkihiroSuda/propagte-exec-root
allow propagating custom exec-root (e.g. "/run/docker") to libnetwork-setkey
2018-09-14 10:18:41 -04:00
Akihiro Suda
ce5bc0079b allow propagating custom exec-root (e.g. "/run/docker") to libnetwork-setkey
The docker daemon needs to be modified as follows:

    diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go
    index 00ace320df..ea7daa72df 100644
    --- a/daemon/oci_linux.go
    +++ b/daemon/oci_linux.go
    @@ -809,7 +809,7 @@ func (daemon *Daemon) createSpec(c *container.Container) (retSpec *specs.Spec, e
                        s.Hooks = &specs.Hooks{
                                Prestart: []specs.Hook{{
                                        Path: target,
    -                                   Args: []string{"libnetwork-setkey", c.ID, daemon.netController.ID()},
    +                                   Args: []string{"libnetwork-setkey", c.ID, daemon.netController.ID(), "-exec-root="+daemon.configStore.GetExecRoot()},
                                }},
                        }
                }

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-09-14 14:09:09 +09:00
Christopher Adam Telfer
e1b464e78f Merge pull request #2268 from jhowardmsft/boltdb
boltdb/bolt==>bbolt, revendor Microsoft/*, Windows compilation.
2018-09-13 16:00:09 -04:00
John Howard
55b80035ed Don't build portallocator on Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-13 09:20:03 -07:00
John Howard
40b6ebfe75 Add init_windows.go for compilation
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-13 09:20:03 -07:00
John Howard
44094fae9f Remove unused syndtr/gocapability from vendor.conf
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-13 09:20:03 -07:00
John Howard
9ca55c7a60 Bump libkv to 458977154600b9f23984d9f4b82e79570b5ae12b
Signed-off-by: John Howard <jhoward@microsoft.com>

As well as bumping, libkv now requires go.etcd.io/bolt rather
than boltdb/bolt. Hence removed bolt from vendor.conf,
vendored go.etcd.io/bbot @ v1.3.1-etcd.8 and rerun vndr.
2018-09-13 09:20:03 -07:00
Christopher Adam Telfer
460ff4e822 Merge pull request #2269 from mirake/fix-typo
Fix typo: assigment -> assignment
2018-09-13 09:50:25 -04:00
Rui Cao
65860893bf Fix typo: assigment -> assignment
Signed-off-by: Rui Cao <ruicao@alauda.io>
2018-09-13 09:59:39 +08:00
John Howard
a906968a3f Bump Microsoft/go-winio to v0.4.11
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-12 14:05:23 -07:00
John Howard
c15a478047 Bump Microsoft/hcsshim to v0.7.3
Signed-off-by: John Howard <jhoward@microsoft.com>
2018-09-12 14:05:04 -07:00
Christopher Adam Telfer
33eca9a291 Merge pull request #2069 from fanjiyun/1-Rolling-back-the-port-configs
Roll back the port configurations upon failure within programIngress()
2018-09-11 14:02:59 -04:00
Thiago Alves Silva
d642cfdeb6 Increase max concurrent requests for DNS from 100 to 1000
This addresses/alleviates https://github.com/docker/libnetwork/issues/2214

The new proposed limit should remediate the issue for most users.

Signed-off-by: Thiago Alves Silva <thiago.alves@aurea.com>
2018-09-11 09:08:58 -03:00
fanjiyun
03ba96c5cf Rolling back the port configs if failed to programIngress()
Signed-off-by: fanjiyun <fan.jiyun@zte.com.cn>
2018-09-11 19:10:59 +08:00
Flavio Crisciani
79074c268f Merge pull request #2266 from riverzhang/typo
Fix some typos
2018-09-08 11:16:35 -07:00
Flavio Crisciani
c2631f3399 Merge pull request #2267 from max8899/patch-1
fix error when make lint
2018-09-08 11:15:52 -07:00
Lei Gong
1adcfa9aa1 fix error when make lint
```
make lint
networkdb/networkdb_test.go:88:2: should replace t.Error(fmt.Sprintf(...)) with t.Errorf(...)
networkdb/networkdb_test.go:136:2: should replace t.Error(fmt.Sprintf(...)) with t.Errorf(...)
make: *** [lint] Error 1
```

Signed-off-by: Lei Gong <lgong@alauda.io>
2018-09-08 21:06:07 +08:00
rongzhang
36375881f3 Fix some typos
Signed-off-by: rongzhang <rongzhang@alauda.io>
2018-09-08 09:33:24 +08:00
Christopher Adam Telfer
02bee778e8 Merge pull request #2264 from halfcrazy/fix/typo
Fix typos in comments
2018-09-07 11:14:20 -04:00
Yan Zhu
ce46100a27 doc: fix typo
Signed-off-by: Yan Zhu <yanzhu@alauda.io>
2018-09-07 11:48:15 +08:00
Christopher Adam Telfer
e29452841e Merge pull request #2259 from resin-os/handle-invalid-default-gateways
bridge: fix error handling for stale default gateways
2018-08-30 11:14:22 -04:00
Christopher Adam Telfer
10008597e0 Merge pull request #2077 from quadespresso/master
Added support for Swarm Service Driller (ssd)
2018-08-28 13:35:24 -04:00
Petros Angelatos
72eed906b8 bridge: fix error handling for stale default gateways
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
2018-08-24 17:43:12 -07:00
Christopher Adam Telfer
556f9f1348 Merge pull request #2258 from Lion-Wei/master
Support getting active/inactive IPVS connection counts
2018-08-24 10:21:53 -04:00
liangwei
99c4c6d5fc ipvs support rs connection information
Signed-off-by: liangwei <liangwei14@huawei.com>
2018-08-22 21:14:26 +08:00
Chris Telfer
afcf6c526d Merge pull request #2253 from selansen/global_add_pool
Add getter functions for Default Address Pools
2018-08-16 16:31:12 -04:00
selansen
814f6c1f4b Add getter function for Default Address Pools
ipamutils has two default address pool. Instead of allowing them to
be accessed directly, adding get functions so that other packages
can use get APIs.

Signed-off-by: selansen <elango.siva@docker.com>
2018-08-16 15:48:42 -04:00
Jim Carroll
a478edc819 Added support for Swarm Service Driller (ssd)
Signed-off-by: Jim Carroll <jim.carroll@docker.com>
2018-08-16 14:30:23 -05:00
Madhu Venugopal
bc2180c4b1 Merge pull request #2251 from dani-docker/ssd_image_rename
Move SSD image to docker
2018-08-16 11:20:51 -07:00
Chris Telfer
26a1cb791d Merge pull request #2241 from selansen/global_add_pool
Global Default Address Pool support
2018-08-16 12:03:01 -04:00
selansen
52e85b4b9a Global Default Address Pool support
This change brings global default address pool feature into
libnetwork. Idea is to reuse same code flow and functions that were
implemented for local scope default address pool.
Function InitNetworks carries most of the changes. local scope default
address pool init should always happen only once. But Global scope
default address pool can be initialized multiple times.

Signed-off-by: selansen <elango.siva@docker.com>
2018-08-16 11:28:24 -04:00
Dani Louca
17966c940a Move SSD image to docker
Signed-off-by: Dani Louca <dani.louca@docker.com>
2018-08-14 14:41:33 -04:00
Thomas Leonard
05c05ea5e9 Add NetworkDB docs
This is based on reading the code in the `networkdb` directory.

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
2018-08-08 13:35:11 +01:00
Flavio Crisciani
3321709a62 Merge pull request #2242 from euanh/pin-gogoprotobuf
Dockerfile: Install a fixed version of gogoprotobuf
2018-07-26 10:51:42 -07:00
Flavio Crisciani
92dd7fda05 Merge pull request #2240 from ctelfer/nice-lb-names
Give LB sandboxes predictable names
2018-07-25 10:14:10 -07:00
Chris Telfer
6d27900ffe Merge pull request #2232 from fcrisciani/ubuntu-dns
Proper handling sandbox options
2018-07-25 13:13:05 -04:00
Euan Harris
72905ebb13 Dockerfile: Install a fixed version of gogoprotobuf
This avoids build failures when gogoprotobuf is changed upstream.

Signed-off-by: Euan Harris <euan.harris@docker.com>
2018-07-25 15:42:25 +01:00
Chris Telfer
5041b74451 Give LB sandboxes predictable names
Change the sandbox IDs for the sandboxes of load-balancing endpoints to
be "lb_XXXXXXXXX" where XXXXXXXXX is the network ID that this sandbox
load balances for.  This makes it easier to find these sandboxes in
/var/run/docker/netns and thus makes debugging easier.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
2018-07-24 17:10:41 -04:00
Flavio Crisciani
55ad3ef1a4 Fix handling of the resolv.conf
Leverage what is it passed from the daemon
Fix check about the host networking

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-07-24 10:18:10 -07:00
Flavio Crisciani
204ce3e31d Create internal directory
Internal directory is designed to contain libraries
that are exclusively used by this project

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-07-16 17:34:20 -07:00
Flavio Crisciani
92b8dfd36c Merge pull request #2234 from talex5/example-imports
Add required imports to example code in README.md
2018-07-16 13:33:41 -07:00