Martynas Pumputis
9b32bc2ab3
Close opened netns
2016-09-14 16:47:40 +01:00
Martynas Pumputis
fd5e1970e1
Return nil netdev if netns of container cannot be found
...
The change applies to GetNetDevsWithPredicate. The function calls
FindNetDevs which already does the same filtering.
The change prevents from "container-addrs" (weaveutil) returning
"unable to open X process namespace" error which happens when
a container dies while the cmd is being executed.
2016-09-14 16:47:16 +01:00
Martynas Pumputis
a1de7f3eef
Enable unsolicited ARPs in 830 test case
...
Otherwise, ping (c1->c3) after the address reuse might time out.
2016-09-14 11:05:00 +01:00
Matthias Radestock
06a63db4cf
Merge branch '1.6'
2016-09-08 12:55:05 +01:00
Matthias Radestock
c720ebec02
Merge pull request #2502 from weaveworks/issues/2469-supply-subnet
...
Pass in default subnet when creating 'weave' plugin network.
Fixes #2469 .
2016-09-08 12:49:01 +01:00
Matthias Radestock
6a528409ab
Merge pull request #2504 from weaveworks/check-tx-off
...
Check current tx value before trying to set it
2016-09-08 12:32:15 +01:00
Bryan Boreham
c69e140e9e
Check current tx value before trying to set it
2016-09-08 10:20:35 +01:00
Anita Buehrle
8ed0c13645
removed broken link
2016-09-06 14:36:25 +01:00
Anita Buehrle
b635f9a994
fixed broken link to command line args
2016-09-06 14:36:25 +01:00
Bryan Boreham
ac4246e1f5
Pass in default subnet when creating 'weave' plugin network.
...
New behaviour in Docker 1.12 means it disregards a plugin-supplied
address pool that overlaps an existing route, which causes a hang as
noted in #2469 . When we pass in the subnet, Docker believes we really
do want that address range and avoids the hang.
2016-09-06 12:05:51 +01:00
Martynas Pumputis
06a325a05f
Use weaveworks/docker/pkg/mflag everywhere
2016-09-05 17:22:28 +03:00
Martynas Pumputis
68e9bbe350
Add github.com/weaveworks/docker submodule
2016-09-05 16:16:06 +03:00
Matthias Radestock
3bd9e369cd
Merge branch '1.6'
2016-09-05 12:51:30 +01:00
Matthias Radestock
3d12e8088e
Merge pull request #2491 from weaveworks/switch-ci-14.04
...
Switch CircleCI build VM to 14.04
2016-09-05 12:49:25 +01:00
Martynas Pumputis
aee35b34fe
Pin joffrey/docker-py image to 1.8.1 vsn
...
The latest image requires 1.12.x dockerd.
2016-09-05 14:30:49 +03:00
Martynas Pumputis
c06ccb3b0d
Change owner of /usr/local/go on build VM
...
Otherwise "go get -tags netgo" fails with the permission denied error.
2016-09-05 14:30:49 +03:00
Martynas Pumputis
268bb656fc
Do not fetch Google Cloud SDK
...
As it is already installed on CircleCI 14.04 build VMs
2016-09-05 14:30:49 +03:00
Martynas Pumputis
57357a728c
Merge branch '1.6'
2016-09-05 13:48:30 +03:00
Martynas Pumputis
a335c419ec
Fix typo
2016-09-05 13:27:49 +03:00
Martynas Pumputis
e263295720
Revert "Do not fetch Google Cloud SDK"
...
This reverts commit f557835ad0 .
2016-08-26 14:42:50 +01:00
Martynas Pumputis
0c854f2144
Merge pull request #2489 from weaveworks/fix-mflag-missing
...
Use mflag package from weaveworks fork until we find a better solution
2016-08-26 12:19:59 +01:00
Alfonso Acosta
bdf4debdfd
Use mflag package from weaveworks fork until we find a better solution
2016-08-26 11:07:21 +00:00
Martynas Pumputis
f557835ad0
Do not fetch Google Cloud SDK
...
As it is already installed on CircleCI 14.04 build VMs
2016-08-26 11:38:37 +01:00
Martynas Pumputis
17a7391086
Remove unused functions
2016-08-26 10:15:27 +01:00
Martynas Pumputis
e65293eb50
Merge branch '1.6'
2016-08-19 14:12:26 +01:00
Martynas Pumputis
48c9547943
Update CHANGELOG.md
2016-08-19 14:11:57 +01:00
Martynas Pumputis
caa6c6c931
Merge branch '1.6'
2016-08-19 11:22:07 +01:00
Martynas Pumputis
11f56031f1
Add release v1.6.1
v1.6.1
2016-08-18 17:39:46 +01:00
Adam Harrison
2e825242cd
Merge branch '1.6'
2016-08-18 11:32:43 +01:00
Adam Harrison
ebe4c5b8b7
Merge pull request #2478 from weaveworks/bridge-veth-setup
...
Refactor: move bridge veth creation into 'init_bridge'
2016-08-18 11:31:16 +01:00
Adam Harrison
027064cbdb
Merge branch '1.6'
2016-08-18 10:56:03 +01:00
Adam Harrison
9fddb827f9
Merge pull request #2442 from weaveworks/cni-setup-fixes
...
CNI setup fixes
2016-08-18 10:55:46 +01:00
Bryan Boreham
3162009325
Refactor: move bridge veth creation into 'init_bridge'
2016-08-17 17:33:34 +01:00
Martynas Pumputis
060f6392c7
Merge branch '1.6'
2016-08-16 18:03:00 +01:00
Martynas Pumputis
8c8c6db7dd
Increase sleep time in 830_cni_plugin_test
...
Fix #2329
2016-08-16 18:00:46 +01:00
Matthias Radestock
cd94dd0088
setup CNI on weave launch[-router]
...
not just `setup[-cni]`
Fixes #2435
2016-08-16 14:18:55 +01:00
Matthias Radestock
afc6f49e80
mount CNI_NETNS dir, in case it is some exotic location
...
Fixes #2394
2016-08-16 14:18:28 +01:00
Martynas Pumputis
c509b6e5bb
Revert "Derive the bridge MAC from concatenated multiple sources"
...
This reverts commit c2083cbce0 .
2016-08-15 09:48:55 +01:00
Bryan Boreham
a466f55d59
Merge pull request #2462 from weaveworks/note-proxy-file
...
added note about net flag
2016-08-12 16:55:57 +01:00
Bryan Boreham
c79b6a8bd7
Merge pull request #2460 from weaveworks/issues/2427-detect-peerid-clashes
...
Detect and report peer name collisions
2016-08-12 16:52:56 +01:00
Martynas Pumputis
c2083cbce0
Derive the bridge MAC from concatenated multiple sources
...
The sources include:
- /etc/machine-id (generated by "systemd-machine-id-setup") or
/var/lib/dbus/machine-id (generated by "dbus-uuidgen").
- /sys/class/dmi/id/product_uuid.
- /sys/hypervisor/uuid.
The product of the concatenation should produce an unique identifier
which is stable across reboots.
2016-08-11 12:01:35 +01:00
Martynas Pumputis
4157d9298d
Update vendored weaveworks/mesh
2016-08-11 12:01:20 +01:00
Adam Harrison
f686408808
Merge branch '1.6'
2016-08-10 14:44:25 +01:00
Adam Harrison
432e10e19f
Merge pull request #2474 from weaveworks/issues/2375-check-vxlan-udp-port
...
Check if a vxlan vport netdev is UP after its creation
2016-08-10 14:44:11 +01:00
Adam Harrison
b8c57ef10f
Merge branch '1.6'
2016-08-10 13:58:53 +01:00
Adam Harrison
601bda3176
Merge pull request #2457 from weaveworks/issues/2424-weaken-tls-check
...
Do not fail launching the proxy if unable to detect a running instance of docker daemon
2016-08-10 13:58:42 +01:00
Martynas Pumputis
d9bde790c6
Check if a vxlan vport netdev is up after its creation
...
This bypasses a kernel bug when the creation of vxlan vport
completes successfully regardless whether an vxlan UDP port has been
bind (http://marc.info/?l=linux-netdev&m=147075637009483&w=2 ).
2016-08-10 13:34:44 +01:00
Adam Harrison
5cc0826ca0
Merge branch '1.6'
2016-08-10 13:16:24 +01:00
Adam Harrison
96f2eb3ecf
Merge pull request #2471 from weaveworks/cni-bridge-ip
...
CNI plugin assigns an IP to the bridge by itself
2016-08-10 11:49:25 +01:00
Adam Harrison
e703f2f3f2
Merge branch '1.6'
2016-08-10 11:48:31 +01:00