Commit graph

2756 commits

Author SHA1 Message Date
Flavio Crisciani
d03dac939f Merge pull request #2313 from fcrisciani/buildkit
Use docker stable engine
2018-12-10 12:51:10 -08:00
Flavio Crisciani
33d47f95e8 Build with latest docker stable engine
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-12-10 08:36:52 -08:00
Flavio Crisciani
650280a057 Merge pull request #2311 from andrewhsu/updt
vndr runc 96ec217
2018-12-06 20:46:26 -08:00
Andrew Hsu
5338928eb8 account for removal of configs.HookState
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-12-07 01:47:05 +00:00
Andrew Hsu
bb3ae82008 vndr runc 96ec217
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-12-07 01:46:14 +00:00
Flavio Crisciani
2dc04ddf4f Merge pull request #2299 from olljanat/ip-to-hostname-fix
Do not add IP to name records for aliases
2018-11-29 08:16:29 -08:00
Flavio Crisciani
7667c0a4b2 Merge pull request #2300 from selansen/master
VXLAN port configuration - late review comments update
2018-11-15 08:25:45 -07:00
selansen
56ca280b27 VXLAN port configuration - late review comments update
Some review comments came in very late after merging
	#2282. This PR addresses those review comments.

Signed-off-by: selansen <elango.siva@docker.com>
2018-11-14 13:26:56 -05:00
Olli Janatuinen
d635844ed7 Do not add IP to Name records for aliases
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2018-11-10 20:53:06 +02:00
Flavio Crisciani
ffa1330066 Merge pull request #2282 from selansen/master
VXLAN UDP Port configuration support
2018-11-05 07:41:26 -08:00
selansen
077ccabc45 VXLAN UDP Port configuration support
This PR chnages allow user to configure VxLAN UDP
port number. By default we use 4789 port number. But this commit
will allow user to configure port number during swarm init.
VxLAN port can't be modified after swarm init.

Signed-off-by: selansen <elango.siva@docker.com>
2018-11-01 15:20:30 -04:00
Flavio Crisciani
2d1311fc1b Merge pull request #2290 from fcrisciani/golint
Update golint tool
2018-11-01 10:21:34 -07:00
Flavio Crisciani
387aed91bf Update golint tool
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-11-01 10:09:47 -07:00
Flavio Crisciani
941f87407d Merge pull request #2285 from myobie/iptables-legacy
debian has iptables-legacy and iptables-nft now
2018-10-31 09:25:39 -07:00
Nathan Herald
7adcd856fe debian has iptables-legacy and iptables-nft now
Signed-off-by: Nathan Herald <me@nathanherald.com>
2018-10-31 09:14:35 -07:00
Flavio Crisciani
cbf4d5ce89 Merge pull request #2171 from thaJeztah/dont_give_up
Handle NXDOMAIN, REFUSED and log errors
2018-10-12 08:38:25 -07:00
Flavio Crisciani
e0d1cdd3d4 Merge pull request #2270 from ctelfer/lbdsr
Use direct server return in east-west overlay load balancing
2018-10-11 17:44:44 -07:00
Sebastiaan van Stijn
6dd3f45248 Handle NXDOMAIN, REFUSED and log errors
- NXDOMAIN is an authoritive answer, so when receiving an NXDOMAIN, we're done.
  From RFC 1035: Name Error - Meaningful only for responses from an authoritative
  name server, this code signifies that the domain name referenced in the query
  does not exist.
  FROM RFC 8020: When an iterative caching DNS resolver receives an NXDOMAIN
  response, it SHOULD store it in its cache and then all names and resource
  record sets (RRsets) at or below that node SHOULD be considered unreachable.
  Subsequent queries for such names SHOULD elicit an NXDOMAIN response.
- REFUSED can be a transitional status: (https://www.ietf.org/rfc/rfc1035.txt)
  The name server refuses to perform the specified operation for
  policy reasons.  For example, a name server may not wish to provide the
  information to the particular requester, or a name server may not wish to
  perform a particular operation (e.g., zone)

Other errors are now logged as debug-message, which can be useful for
troubleshooting.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-12 00:55:36 +02:00
Sebastiaan van Stijn
a72bff0da3 Remove if/else and redundant brackets in resolver
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-12 00:55:28 +02:00
Christopher Adam Telfer
466225b792 Merge pull request #2276 from amoghe/amoghe_dest_stats
Add destination stats extraction to IPVS library
2018-10-11 18:01:20 -04:00
Chris Telfer
013ca3bdf8 Make DSR an overlay-specific driver "option"
Allow DSR to be a configurable option through a generic option to the
overlay driver.  On the one hand this approach makes sense insofar as
only overlay networks can currently perform load balancing.  On the
other hand, this approach has several issues.  First, should we create
another type of swarm scope network, this will prevent it working.
Second, the service core code is separate from the driver code and the
driver code can't influence the core data structures.  So the driver
code can't set this option itself.  Therefore, implementing in this way
requires some hack code to test for this option in
controller.NewNetwork.

A more correct approach would be to make this a generic option for any
network.  Then the driver could ignore, reject or be unaware of the option
depending on the chosen model.  This would require changes to:
  * libnetwork - naturally
  * the docker API - to carry the option
  * swarmkit - to propagate the option
  * the docker CLI - to support the option
  * moby - to translate the API option into a libnetwork option
Given the urgency of requests to address this issue, this approach will
be saved for a future iteration.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
2018-10-11 14:13:19 -04:00
Chris Telfer
9a2464f436 Set east-west load balancing to use direct routing
Modify the loadbalancing for east-west traffic to use direct routing
rather than NAT and update tasks to use direct service return under
linux.  This avoids hiding the source address of the sender and improves
the performance in single-client/single-server tests.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
2018-10-11 14:13:19 -04:00
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
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