Commit graph

2840 commits

Author SHA1 Message Date
Euan Harris
587783fb82 Merge pull request #1656 from huikang/remove-unused-testcode
Removed unused integration test code
2019-06-27 09:57:12 +01:00
Euan Harris
92611bb5f7 Merge pull request #2408 from euanh/golang-1.12.6
Update to Golang 1.12.6
2019-06-27 09:46:29 +01:00
Euan Harris
3eeda3d91c Dockerfile: Update to Go 1.12.6, matching moby/moby
Signed-off-by: Euan Harris <euan.harris@docker.com>
2019-06-26 16:54:53 +01:00
Euan Harris
84414583f0 gofmt: Fix formatting warnings
Signed-off-by: Euan Harris <euan.harris@docker.com>
2019-06-26 16:54:31 +01:00
Euan Harris
746e680871 vet: Fix format string warnings
Signed-off-by: Euan Harris <euan.harris@docker.com>
2019-06-26 16:51:22 +01:00
Euan Harris
0275b007c6 vet: Fix composite literal uses unkeyed fields warnings
Signed-off-by: Euan Harris <euan.harris@docker.com>
2019-06-26 16:50:56 +01:00
Euan Harris
3780098cd6 Merge pull request #2389 from tonistiigi/bridge-riscv
bridge: add riscv64 build tags
2019-06-26 15:34:02 +01:00
Tonis Tiigi
75bc82fe5c bridge: add riscv64 build tags
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-06-26 11:11:15 +08:00
Euan Harris
5c8048b363 Merge pull request #2404 from smarkm/master
Remove roadmap link from README.md
2019-06-25 15:24:14 +01:00
Euan Harris
1e476e7de6 Merge pull request #2365 from thaJeztah/fix_loadIPAMDriver_error_handling
controller.loadIPAMDriver: Unwrap error type returned by PluginGetter
2019-06-25 15:15:45 +01:00
Euan Harris
c3d402cef3 Merge pull request #2403 from thaJeztah/carry_2370_sctp_update
[carry 2370] Update sctp package
2019-06-25 15:11:50 +01:00
Euan Harris
d297a25283 Merge pull request #1723 from sebradloff/patch-1
Change wording for Endpoint description
2019-06-25 15:09:04 +01:00
Euan Harris
c0c586aacb Merge pull request #2279 from mrbeskin/clarify-design-doc
clarifications and typo fixes for the design documentation
2019-06-25 15:07:57 +01:00
Smark
1f1d9898c9 road map loss tracing, just keep use 'Design' describe the 'Future'
Signed-off-by: Smark <smark@freecoop.net>
2019-06-25 22:06:30 +08:00
smark
3ba3118873 Merge pull request #1 from docker/master
up to date
2019-06-25 21:31:28 +08:00
Sascha Grunert
c5c8653912 Update sctp package
This commit updates the vendored ishidawataru/sctp and adapts its used
types.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-24 17:26:33 +02:00
Sebastiaan van Stijn
1425fd4fcc controller.loadIPAMDriver: Unwrap error type returned by PluginGetter
moby/moby commit b27f70d45 wraps the ErrNotFound error returned when
a plugin cannot be found, to include a backtrace.   This changes the
type of the error, so contoller.loadIPAMDriver no longer converts it
to a libnetwork plugin.NotFoundError.

This is a similar patch as was merged in 9b114971e5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-24 16:40:51 +02:00
Euan Harris
d9ac962114 Merge pull request #2396 from mavenugo/um
Maintainers update
2019-06-24 15:25:30 +01:00
Euan Harris
0286b0155d Merge pull request #2366 from thaJeztah/bump_netlink_1.0
Bump vishvananda/netlink to 1.0.0
2019-06-24 14:27:39 +01:00
Sebastiaan van Stijn
e9e18d993c bump github.com/vishvananda/netns 13995c7128ccc8e51e9a6bd2b551020a27180abd
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-24 14:56:52 +02:00
Sebastiaan van Stijn
d152888722 Bump vishvananda/netlink to 1.0.0
Changes included:

- Allow index specification at link creation time
- replace syscall with golang.org/x/sys/unix
  - related: Use IFF_MULTI_QUEUE from x/sys/unix to define TUNTAP_MULTI_QUEUE
  - related: Use IFLA_* constants from x/sys/unix
- Fix index out of range when no metadata for gretap
- added encapsulation attributes for Iptun and Sittun to support SIT tunnels
- Expose xfrm state's statistics
- Support invert in ip rules
- Support LWTUNNEL_ENCAP_SEG6
- Support setting and retrieving route MTU/AdvMSS
- Fix CalcRtable array parameter bug
- added support for Foo-over-UDP netlink calls
- Support num{tx,rx}queues and udp6zerocsum{tx,rx}
- tuntap: Add multiqueue support
- Retrieve VLAN ID when listing neighbour
- Fix LinkAdd for sit tunnel on 3.10 kernel
- Add support for managing source MACVLANs
- Two functions: one for adding bond slave, one for getting veth peer index
- Eliminate cgo from netlink
- Don't overwrite the XDP file descriptor with flags
- Fix reference to BPF instructions (on Kernel 4.13)
- Add Matchall filter
- Send IFA_CACHEINFO when setting up addresses
- Support IPv6 GRE Tun and Tap
- Add List option to RouteSubscribeWithOptions, AddrSubscribeWithOptions, and LinkSubscribeWithOptions
- Add Fq and Fq_Codel Qdisc support

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-24 14:56:49 +02:00
Euan Harris
97d292bf26 Merge pull request #2361 from thaJeztah/bump_engine
Reformat vendor.conf, update docker/docker and dependencies
2019-06-24 08:47:51 +01:00
Madhu Venugopal
0fce3b3653 Maintainers update
- Add Euan and Elango
- Remove inactive maintainers

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2019-06-21 14:27:00 -07:00
Euan Harris
8d76333719 Merge pull request #2339 from phyber/iptables-check
controller: Check if IPTables is enabled for arrangeUserFilterRule
2019-06-21 17:31:52 +01:00
Euan Harris
bdd0b7bb40 Merge pull request #2394 from arkodg/dns-lookup-case-insensitive
Make DNS records and queries case-insensitive
2019-06-20 16:37:07 +01:00
Arko Dasgupta
313d2b8a74 Make DNS records and queries case-insensitive
RFC434 states that DNS Servers should be case insensitive
    This commit makes sure that all DNS queries will be translated
    to lower ASCII characters and all svcRecords will be saved in
    lower case to abide by the RFC

    Relates to https://github.com/moby/moby/issues/21169

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2019-06-19 11:23:31 -07:00
Euan Harris
a926e65406 Merge pull request #2364 from thaJeztah/fix_TestValidRemoteDriver
Fix TestValidRemoteDriver GetCapabilities errors
2019-06-14 17:13:23 +01:00
Madhu Venugopal
fc69adf859 Merge pull request #2372 from xinfengliu/improve-support.sh
add checks on node LB in support.sh
2019-06-04 09:22:10 -07:00
Tibor Vass
631ee43f1b Merge pull request #2373 from arkodg/ungraceful-exit-config-from-net-clean
Clean up --config-only networks after --config-from networks have ungracefully exited
2019-06-04 08:46:31 -07:00
Tibor Vass
5738499b9d Merge pull request #2385 from tiborvass/resolvconf-systemd
resolvconf: use /run/systemd/resolve/resolv.conf if systemd-resolved manages DNS
2019-06-04 08:10:32 -07:00
Tibor Vass
599e037a24 remove gosimple - package is gone and it's not important
Also fixes issue reported by ineffassign

Signed-off-by: Tibor Vass <tibor@docker.com>
2019-06-04 04:50:37 +00:00
Tibor Vass
c575631528 resolvconf: use /run/systemd/resolve/resolv.conf if systemd-resolved manages DNS
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-06-04 04:50:37 +00:00
Sebastiaan van Stijn
e9bd147bb7 Add Delete endpoint for plugin in test
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-23 14:55:29 +02:00
Sebastiaan van Stijn
cc38e3a35c Fix TestValidRemoteDriver GetCapabilities errors
This test was producing error messages due to missing endpoints
in the plugin API;

```
=== RUN   TestValidRemoteDriver
ERRO[0039] error getting capability for valid-network-driver due to NetworkDriver.GetCapabilities: 404 page not found
 ```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-05-23 14:55:20 +02:00
Arko Dasgupta
ee574c1b7d Correctly clean up --config-only networks
The endpoint count for --config-only networks
was being incremented even when the respective --config-from
inherited network failed to create a network

This was due to a variable shadowing problem with err causing
the deferred function to not execute correctly.

Using the same err variable across the entire function fixes
the issue

Fixes: moby/moby#35101

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2019-05-14 10:20:14 -07:00
Madhu Venugopal
992e4b903a Merge pull request #2376 from pradipd/NilIPToZero
Forcing a nil IP specified in PortBindings to IPv4zero (0.0.0.0).
2019-05-14 09:03:19 -07:00
Pradip Dhara
a04a30717e Forcing a nil IP specified in PortBindings to IPv4zero (0.0.0.0).
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2019-05-13 15:42:32 -07:00
Xinfeng Liu
74013a3899 add check on node LB in support.sh
Starting from 18.09, there's a per node LB for each overlay
network, this change adds the check to node LB.
This change should not break on older docker versions.

Signed-off-by: Xinfeng Liu <xinfeng.liu@gmail.com>
2019-05-07 16:45:01 +08:00
David O'Rourke
301a7724fb Move hasIPTablesEnabled check into firewall_linux.go
Signed-off-by: David O'Rourke <david@scalefactory.com>
2019-04-29 13:51:15 +01:00
David O'Rourke
b4d0319424 controller: Check if IPTables is enabled for arrangeUserFilterRule
This allows the `--iptables=false` argument to the `dockerd` to actually
work.

Signed-off-by: David O'Rourke <david@scalefactory.com>
2019-04-29 13:27:01 +01:00
Madhu Venugopal
60b2a582d4 Merge pull request #2368 from pradipd/WindowsPortMappingFix
(windows) Pick a random host port if the user does not specify a host port.
2019-04-23 08:21:50 -07:00
Pradip Dhara
1909ecb27a Pick a random host port if the user does not specify a host port.
For overlay, l2bridge, and l2tunnel, if the user does not specify a host port, windows driver will select a random port for them.  This matches linux behavior.
For ics and nat networks the windows OS will choose the port.

Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2019-04-22 17:43:27 +00:00
Sebastiaan van Stijn
6ee0b5fcd8 update docker/docker and dependencies
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-08 12:09:49 +02:00
Sebastiaan van Stijn
0b40402976 Reformat vendor.conf for readability, pin to git-sha's
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-08 11:55:15 +02:00
Sebastiaan van Stijn
f126923aeb re-vendor with current version of LK4D4/vndr
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-08 11:50:39 +02:00
Madhu Venugopal
dd46dba69d Merge pull request #2357 from mavenugo/win-rs1-ov-bug
Print proper error log when peerAdd fails
2019-04-07 08:45:33 -07:00
Madhu Venugopal
5c6423fb29 Adding error log if peerAdd fails
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2019-04-05 20:31:17 -07:00
Madhu Venugopal
d1c0ff02a7 Merge pull request #2356 from pradipd/RS1-Synch
Adding synchronization around peerAdd and peerDelete to prevent network connectivity issue
2019-04-05 17:52:23 -07:00
Pradip Dhara
94ab7b2df6 Adding synchronization to endpoint addition/deletion to prevent network connectivity issue
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2019-04-05 14:19:19 -07:00
Madhu Venugopal
be71a0d834 Merge pull request #2355 from thaJeztah/wrap_errors
Use errors.Wrap to preserve original error
2019-04-04 05:36:28 -07:00