Commit Graph

1622 Commits

Author SHA1 Message Date
Santhosh Manohar
ec17841ea4 Switch overlay encryption to use IPSec susbsystem keys
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-06-15 04:10:23 -07:00
Alessandro Boch
b766159f38 Merge pull request #1293 from mrjana/overlay
Update ovmanager to support maximum vni
2016-06-24 18:50:28 -07:00
Jana Radhakrishnan
d3b8412ac6 Update ovmanager to support maximum vni
To support maximum possible overlay networks in swarm mode.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-24 16:41:53 -07:00
Madhu Venugopal
a4f03577b5 Merge pull request #1291 from aaronlehmann/sanbox
Fix sanbox typo
2016-06-24 15:33:20 -07:00
Aaron Lehmann
91e8d5bfb9 Fix sanbox typo
Change "sanbox" to "sandbox".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-06-24 15:14:01 -07:00
Jana Radhakrishnan
d82e80e221 Merge pull request #1206 from jimmycmh/master
Remove Lock in datastore for global scope
2016-06-24 06:38:05 -07:00
menghui.chen
115cdb52b3 Remove Lock in datastore for global scope
Signed-off-by: menghui.chen <menghui.chen@alibaba-inc.com>
2016-06-23 14:22:58 +08:00
Alessandro Boch
ba36e2b75e Merge pull request #1286 from nerdalert/vlan_doc
Fixed missing v6 enable flag in macvlan doc
2016-06-22 17:05:44 -07:00
Brent Salisbury
500a255181 Fixed missing v6 enable flag in macvlan doc
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-06-22 19:59:55 -04:00
Alessandro Boch
23830083ea Merge pull request #1282 from sanimej/lateread
For cached connections ignore late replies after read timeout
2016-06-22 08:17:42 -07:00
Alessandro Boch
382aefbeb5 Merge pull request #1279 from BSWANG/master
make sure interface up successful
2016-06-22 08:17:28 -07:00
Alessandro Boch
0c9b6e44dd Merge pull request #1283 from sanimej/keys
Add debugs for key change events in networkdb
2016-06-21 18:27:03 -07:00
Santhosh Manohar
dd19ad27d8 Merge pull request #1281 from aboch/vnd
Gracefully handle missing xfmr modules and netlink vendor
2016-06-21 13:49:28 -07:00
Alessandro Boch
0122e632e3 Merge pull request #1280 from nerdalert/macvlan_docs
Added docs for macvlan driver
2016-06-21 09:45:29 -07:00
bingshen.wbs
93cada0d94 make sure interface up successful
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
2016-06-21 14:28:13 +08:00
Alessandro Boch
117131c41b Gracefully handle missing xfrm modules
If xfrm modules cannot be loaded:
- Create netlink.Handle only for ROUTE socket
- Reject local join on overlay secure network

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-20 17:25:32 -07:00
Alessandro Boch
b39f13f80e Update vishvananda/netlink 734d02c
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-20 12:54:58 -07:00
Brent Salisbury
165a1f6021 Added docs for macvlan driver
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-06-20 05:55:45 -04:00
Alessandro Boch
090a12035f Merge pull request #1275 from sanimej/3keys
Update key handling logic to process keyring with 3 keys
2016-06-19 11:03:20 -07:00
Madhu Venugopal
7541e6b6c7 Merge pull request #1276 from mrjana/lb
Do not bulk sync state which is getting deleted
2016-06-18 19:05:21 -07:00
Jana Radhakrishnan
6538faa880 Do not bulk sync state which is getting deleted
Bulk sync should not sync state which is getting deleted

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-18 17:58:51 -07:00
Santhosh Manohar
467ac53445 Merge pull request #1274 from aboch/gsr
Make getSvcRecords() more robust
2016-06-18 11:37:37 -07:00
Alessandro Boch
d7d88ce37d Make getSvcRecords() more robust
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-17 18:51:57 -07:00
Alessandro Boch
21c6bab508 Merge pull request #1273 from mrjana/lb
Match only locally destined requests for ingress
2016-06-17 10:22:50 -07:00
Jana Radhakrishnan
ad35d257ff Match only locally destined requests for ingress
Currently even outgoing connection requests are matched to inject into
DOCKER-INGRESS chain. This is not correct because it disrupts access to
services outside the host on the same service port. Instead inject only
the locally destined packets towards DOCKER-INGRESS chain.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 09:57:58 -07:00
Madhu Venugopal
a376f0a657 Merge pull request #1271 from aboch/binit
Bridge driver to detect and remove stale network
2016-06-16 14:03:30 -07:00
Alessandro Boch
c963031a44 Bridge driver to detect and remove stale network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-16 11:14:00 -07:00
Madhu Venugopal
18667cfc2c Merge pull request #1270 from mrjana/networkdb
Fix infinite loop in bulk sync
2016-06-16 08:07:04 -07:00
Santhosh Manohar
131b1aa136 Merge pull request #1269 from mrjana/lb
Do not add loadbalancer to unpopulated sandboxes
2016-06-16 08:05:05 -07:00
Jana Radhakrishnan
6034058dc3 Fix infinite loop in bulk sync
Due to a slice management logic error the bulk sync for loop can go on
indefinitely and eventually leading to an OOM error. Fixed the logic so
that an infinite loop never occurs. Also changed the bulk sync wait
timeout to use a timer rather than use time.After as time.After is known
to consume a lot of memory when called in a tight loop.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-15 23:38:48 -07:00
Jana Radhakrishnan
d5ce149555 Do not add loadbalancer to unpopulated sandboxes
When adding a loadbalancer to a sandbox, the sandbox may have a valid
namespace but it might not have populated all the dependent network
resources yet. In that case do not populate that endpoint's loadbalancer
into that sandbox yet. The loadbalancer will be populated into the
sandbox when it is done populating all the dependent network resources.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-15 19:58:33 -07:00
Alessandro Boch
0551112769 Merge pull request #1267 from sanimej/extdns
Setup external DNS servers after daemon restart with live-restore
2016-06-15 17:46:25 -07:00
Santhosh Manohar
bfbe9237d4 Merge pull request #1265 from aboch/hn
Refresh special driver networks if present in store
2016-06-15 14:43:05 -07:00
Jana Radhakrishnan
b2d5daab2a Merge pull request #1266 from aboch/lgs
Reduce overlay encryption log noise
2016-06-15 10:53:31 -07:00
Alessandro Boch
48739b5868 Reduce overlay encryption log noise
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-15 09:25:28 -07:00
Alessandro Boch
9328f1ea1e Refresh special drivers networks if present in store
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-14 21:50:58 -07:00
Madhu Venugopal
3b705e73e6 Merge pull request #1263 from mrjana/lb
Add service alias support
2016-06-14 18:26:48 -07:00
Jana Radhakrishnan
acac7ee812 Add service alias support
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-14 16:40:54 -07:00
Alessandro Boch
179f08a3f2 Merge pull request #1262 from sainath14/macvlan_endpoint_delete
Delete endpoint from network map for macvlan driver upon endpoint deletion
2016-06-14 15:07:26 -07:00
sainath
e2b0934ac2 Delete endpoint from network map for macvlan driver upon endpoint deletion
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
2016-06-14 13:50:43 -07:00
Jana Radhakrishnan
4202b1f92d Merge pull request #1244 from aboch/restore
Add network restore to support docker live restore container
2016-06-14 13:33:26 -07:00
Alessandro Boch
d18b56e8bf Merge pull request #1261 from mrjana/networkdb
Properly purge node networks when node goes away
2016-06-14 13:31:37 -07:00
Jana Radhakrishnan
f5f576ad34 Properly purge node networks when node goes away
When a node goes away purge all the network attachments from the node
and make sure we don't attempt bulk syncing to that node once removed.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-14 12:39:38 -07:00
Jana Radhakrishnan
f067c861f5 Merge pull request #1258 from mavenugo/mv
Moving MacVlan driver out of experimental
2016-06-14 12:29:04 -07:00
Alessandro Boch
0654c113d9 Merge pull request #1259 from leecalcote/patch-1
design.md: fixed anchor reference
2016-06-14 07:52:00 -07:00
Lee Calcote
5c5a43124a design.md: fixed anchor reference
The #Drivers reference needed to be #drivers in order for the anchor to work correctly.

Signed-off-by: Lee Calcote <leecalcote@gmail.com>
2016-06-14 06:30:03 -05:00
Santhosh Manohar
929921a640 Add debugs for key change events in networkdb
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-06-14 03:13:48 -07:00
Alessandro Boch
011d0959d1 Merge pull request #1260 from mrjana/lb
Sequence non-persistent objects in cache
2016-06-14 00:30:04 -07:00
Jana Radhakrishnan
1272f90eae Sequence non-persistent objects in cache
Since the datastore interface is common for persistent and
non-persistent objects we need to provide the same kind of sequencing
and atomicity guarantess to non-persistent data operations as we do for
persistent operations. So added sequencing and atomicity checks in the
data cache layer.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-13 23:53:05 -07:00
Santhosh Manohar
54f694c913 For cached connections ignore late replies after read timeout
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-06-13 23:50:02 -07:00