Commit Graph

547 Commits

Author SHA1 Message Date
Jana Radhakrishnan a7fb18793f Merge pull request #355 from chenchun/compile
Use github golang tools mirror
2015-07-09 12:25:00 -06:00
Madhu Venugopal d6b189f249 Merge pull request #367 from crquan/patch-1
fix file descriptor leak of ".../ip_local_port_range"
2015-07-09 12:14:24 +05:30
Derek 1accb4da40 fix file descriptor leak of ".../ip_local_port_range"
fix file descriptor leak of "/proc/sys/net/ipv4/ip_local_port_range"
2015-07-07 16:56:24 -07:00
Madhu Venugopal 0517ceae7d Merge pull request #366 from mrjana/cnm
BitSequence should unmarshal data during get
2015-07-07 09:21:57 +08:00
Madhu Venugopal 161770051f Merge pull request #357 from runseb/vagrant-docs
Some users docs with a Vagrant setup
2015-07-07 09:19:15 +08:00
Jana Radhakrishnan 8e69328c3b BitSequence should unmarshal data during get
When bit sequence is trying to get key/value from the
data store it should always unmarshall the json data
before using it, as the data is JSON marshalled before
storing it in the data store.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-06 11:25:42 -07:00
Jana Radhakrishnan 8fb0a8bc9e Merge pull request #363 from aboch/nf
Fix incorrect error handling in bitseq constructor
2015-07-05 22:16:54 -07:00
Alessandro Boch 4f6d381470 Fix incorrect error handling in bitseq constructor
- We must ignore key not found error when querying
  datastore for initial state.
- Regression introduced by e2a63dff5a

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-07-04 17:35:55 -07:00
Jana Radhakrishnan 72ac684e76 Merge pull request #361 from dave-tucker/bug/358
Use IANA assigned VXLAN port
2015-07-02 23:14:09 -07:00
Dave Tucker f5df0c6bbd Use IANA assigned VXLAN port
Fixes #358

Signed-off-by: Dave Tucker <dt@docker.com>
2015-07-03 03:43:02 +01:00
Jana Radhakrishnan 0e8c92c140 Merge pull request #360 from mrjana/cnm
Cherry picks from docker1.7_integ branch
2015-07-02 10:51:23 -07:00
Jana Radhakrishnan 69f7012abc Adjust overlay driver for netlink api change
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 10:39:43 -07:00
Jana Radhakrishnan ef34c93d96 Honor driver side resolv.conf file
For the moment in 1.7.1 since we provide a resolv.conf set api
to the driver honor that so that for host driver we can use the
the host's /etc/resolv.conf file as is rather than putting the
contents through a filtering logic.

It should be noted that the driver side capability to set the
resolv.conf file is most likely going to go away in the future
but this should be fine for 1.7.1

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 10:39:06 -07:00
Jana Radhakrishnan 995fafc60c Update vishvananda/netlink package
PR to update to vishvananda/netlink package

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 09:32:22 -07:00
Jana Radhakrishnan d7cfd9b2f1 Manually bring up the host side veth interface
In preparation for the new update of vishvananda/netlink package
we need to bringup the host veth interface manually.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 09:32:03 -07:00
Jana Radhakrishnan 3527ebe475 Fix networking issues in RHEL/Centos 6.6
Some parts of the bridge driver code needs to use a different kernel
api or use the already existing apis in slightly different ways to
make the bridge driver work in RHEL/Centos 6.6. This PR provides
those fixes.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 09:31:13 -07:00
Jana Radhakrishnan ccc42943dd Use ioctls to create bridge
The netlink way of creating bridge has problems in older
kernels like the one used on RHEL 6 (which is a supported
one). So trying to use ioctl method to create bridge
so that it works on any version.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 09:27:53 -07:00
Jana Radhakrishnan 6e3e9644da Updated Godeps
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-02 09:24:12 -07:00
Sebastien Goasguen 895711e1a3 Some users docs with a Vagrant setup 2015-07-01 23:04:46 +02:00
aboch d1b8d48166 Merge pull request #356 from runseb/typo-overlay
small typo in the requirements
2015-07-01 10:06:28 -07:00
Sebastien Goasguen 956c4f8ef7 small typo in the requirements 2015-07-01 15:35:52 +02:00
Chun Chen 82137d92de Use github golang tools mirror
Signed-off-by: Chun Chen <ramichen@tencent.com>
2015-07-01 12:57:39 +08:00
Madhu Venugopal 3bf84c6c03 Merge pull request #270 from amylindburg/master
Update ROADMAP.md
2015-06-30 17:14:56 -07:00
Jana Radhakrishnan c59cd1298e Merge pull request #352 from mavenugo/master
Updating to latest netns to fix amd64 / RPI issues
2015-06-30 15:06:25 -07:00
Madhu Venugopal d0e3d0c3fb Updating to latest netns to fix amd64 / RPI issues
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-30 14:46:49 -07:00
Madhu Venugopal 4c14cd316f Merge pull request #348 from aboch/is
Endpoint interface stats read fails when invoked from docker
2015-06-30 11:04:39 -07:00
Alessandro Boch d01976c969 Endpoint interface stats read fails when invoked from docker
- When invoked from docker, endpoint.Statistics() returns
  the statistics of the host's interfaces.

  Issue is tracked down to ioutil.ReadFile(). For some
  reason even if invoked from inside the sandbox netns,
  it ends up reading the stats file from the default netns,
  when invoked from docker.
  If same operation is run from inside a dedicated binary,
  it works as expected.

- Replacing it with exec.Command("cat", <file>) solves the issue

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-06-29 20:29:41 -07:00
Madhu Venugopal 5c57ba5f54 Merge pull request #342 from alexwlchan/master
Minor spelling fixes in documentation and code comments
2015-06-29 19:57:09 -07:00
Madhu Venugopal 105a07f347 Merge pull request #346 from aboch/is
Endpoint to expose interfaces' statistics
2015-06-29 16:45:04 -07:00
Alessandro Boch 6b80e22053 Endpoint to expose interfaces' statistics
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-06-29 16:15:31 -07:00
Madhu Venugopal d68e862b5e Merge pull request #345 from mbentley/overlay-doc-fix
Fixed URL used by curl in overlay readme
2015-06-26 21:26:58 -07:00
Matt Bentley a57a2af191 Fixed URL used by curl in overlay readme
Signed-off-by: Matt Bentley <mbentley@mbentley.net>
2015-06-26 21:07:26 -04:00
Jana Radhakrishnan f536e7c7aa Merge pull request #339 from nerdalert/overlay-doc
multi-host overlay driver quick start doc
2015-06-26 13:15:49 -07:00
Jana Radhakrishnan 01d9fc486d Merge pull request #335 from glevand/for-merge-netns
netns: Update to latest for arm64
2015-06-26 13:14:57 -07:00
Madhu Venugopal 64d1b728bb Merge pull request #278 from LK4D4/firewalld_support
Resurrect firewalld support
2015-06-26 13:12:19 -07:00
Alex Chan 86f32c245b Minor spelling fixes in documentation and code comments 2015-06-26 11:02:54 +01:00
Brent Salisbury 1dbc1bc4fe multi-host overlay driver quick start doc 2015-06-25 21:47:41 -07:00
aboch 7d501b2b73 Merge pull request #304 from wulonghui/wulonghui-patch-1
Update modprobe bridge output
2015-06-25 16:51:30 -07:00
aboch ece45cbf53 Merge pull request #333 from calavera/extra_conditional
Remove extra conditional.
2015-06-25 14:59:19 -07:00
Jana Radhakrishnan b3ea0cc828 Merge pull request #314 from spikecurtis/store-create-v2
Datastore handles creating objects atomically.
2015-06-25 14:43:16 -07:00
Geoff Levand f1bfee5048 netns: Update to latest for arm64
Signed-off-by: Geoff Levand <geoff@infradead.org>
2015-06-25 14:22:00 -07:00
Spike Curtis e2a63dff5a Datastore handles creating objects atomically.
In that commit, AtomicPutCreate takes previous = nil to Atomically create keys
that don't exist.  We need a create operation that is atomic to prevent races
between multiple libnetworks creating the same object.

Previously, we just created new KVs with an index of 0 and wrote them to the
datastore.  Consul accepts this behaviour and interprets index of 0 as
non-existing, but other data backends do no.

 - Add Exists() to the KV interface.  SetIndex() should also modify a KV so
   that it exists.
 - Call SetIndex() from within the GetObject() method on DataStore interface.
   - This ensures objects have the updated values for exists and index.
 - Add SetValue() to the KV interface.  This allows implementers to define
   their own method to marshall and unmarshall (as bitseq and allocator have).
 - Update existing users of the DataStore (endpoint, network, bitseq,
   allocator, ov_network) to new interfaces.
 - Fix UTs.
2015-06-25 10:53:48 -07:00
David Calavera 6885ea8036 Remove extra conditional.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-06-25 09:58:16 -07:00
Jana Radhakrishnan cc86aee642 Merge pull request #328 from wulonghui/wulonghui-patch-3
Update error return in bridge driver's getNetwork
2015-06-24 23:59:54 -07:00
wulonghui 7df8d3eb4c Update error return in bridge driver's getNetwork 2015-06-25 19:33:46 +08:00
Madhu Venugopal 82a1f56349 Merge pull request #330 from mrjana/sd
Do not update /etc/hosts for empty endpoints
2015-06-24 12:30:26 -07:00
Jana Radhakrishnan 6f65b9b17d Do not update /etc/hosts for empty endpoints
There is no need to update the /etc/hosts files
of containers for endpoints which are created/deleted
in a network whose interface list is empty

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-06-24 12:09:44 -07:00
Alexander Morozov 0220b06cd6 Resurrect firewalld support
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-21 16:42:01 -07:00
Madhu Venugopal 1aaf1047fd Merge pull request #326 from mavenugo/wneigh
Fixing a windows compile error in docker during vendor-in
2015-06-21 03:30:56 -07:00
Madhu Venugopal 7086aa85b1 Fixing a windows compile error in docker during vendor-in
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-06-21 02:32:07 -07:00