Bryan Boreham
1d55ee19e4
Merge branch '1.9'
2017-03-17 11:46:32 +00:00
Bryan Boreham
9da5cee8d9
Rename Kubernetes daemonset to "1.6"
...
To emphasise this is the version that adopters of Kubernetes 1.6 need
to use.
2017-03-17 11:45:06 +00:00
Lucas Käldström
2e58e92d48
Add a weave-kube manifest that works for kubeadm v1.6
2017-03-17 11:43:48 +00:00
Bryan Boreham
9810a84475
Merge branch '1.9'
2017-03-16 19:43:50 +00:00
Bryan Boreham
c3c28ea27e
Update CNI library to version 0.5.0
2017-03-16 18:23:20 +00:00
Bryan Boreham
623abeef4c
gofmt
2017-03-14 17:56:59 +00:00
Stephan Austermühle
dc2925263c
Destroy ipsets prefixed weave- only (issue #2751 )
2017-03-14 17:56:59 +00:00
Marc CARRE
21a0fc30e8
Run weaver without exec.
...
This:
1. prevents from generating defunct (a.k.a. zombie) processes, and therefore fixes #2836 ; but also
2. reintroduces #2684/#2688 as shells do not forward signals and we are still running more than one process.
A proper fix would leverage something like tini.
See also:
- github.com/krallin/tini
- github.com/krallin/tini/issues/8
- github.com/docker-library/official-images#init
Sample output:
- during initialisation:
```
$ ps auxf
[...]
root 1380 0.4 1.9 879660 74660 ? Ssl Mar13 6:02 /usr/bin/docker daemon -H fd:// -H unix:///
root 1664 0.0 0.4 502116 18528 ? Ssl Mar13 0:06 \_ docker-containerd -l /var/run/docker/li
root 15482 0.0 0.0 200496 3364 ? Sl 15:04 0:00 \_ docker-containerd-shim 3d1f5eb6e090
root 15496 0.0 0.0 1524 996 ? Ss 15:04 0:00 | \_ /bin/sh /home/weave/launch.sh
root 15780 0.0 0.0 1524 64 ? S 15:04 0:00 | \_ /bin/sh /home/weave/launch.
root 15872 0.0 0.0 1772 1272 ? S 15:04 0:00 | | \_ /bin/sh /home/weave/wea
root 15897 0.0 0.0 1772 324 ? S 15:04 0:00 | | \_ /bin/sh /home/weave
root 15898 0.0 0.0 14656 2948 ? S 15:04 0:00 | | \_ curl -o /tmp/we
root 15781 10.0 1.5 484556 60296 ? Sl 15:04 0:00 | \_ /home/weave/weaver --port=6
[...]
```
- after initialisation:
```
$ ps auxf
[...]
root 1380 0.4 1.9 879660 74660 ? Ssl Mar13 6:02 /usr/bin/docker daemon -H fd:// -H unix:///
root 1664 0.0 0.4 502116 18592 ? Ssl Mar13 0:06 \_ docker-containerd -l /var/run/docker/li
root 15482 0.0 0.0 200496 3364 ? Sl 15:04 0:00 \_ docker-containerd-shim 3d1f5eb6e090
root 15496 0.0 0.0 1524 996 ? Ss 15:04 0:00 | \_ /bin/sh /home/weave/launch.sh
root 15781 2.3 1.6 503064 64320 ? Sl 15:04 0:00 | \_ /home/weave/weaver --port=6[...]
```
2017-03-14 15:34:47 +00:00
Bryan Boreham
8468183738
'redacted' is a better word than 'elided'
2017-03-09 10:44:48 +00:00
Bryan Boreham
39563fc142
Merge pull request #2829 from dlmiddlecote/issues/2815-check-live-containers
...
Only check running containers for existing addresses
2017-03-09 09:53:03 +00:00
Daniel Middlecote
104d2240ec
Move container lists to scope they are used in
2017-03-08 21:43:21 +00:00
Daniel Middlecote
fd28740108
Only check running containers for existing addresses
2017-03-06 22:10:45 +00:00
Bryan Boreham
fa74d1b9bb
Merge two ADD commands to remove a layer
2017-03-06 11:29:09 +00:00
Bryan Boreham
e2c96cfa85
Remove/move down WORKDIR lines in Dockerfiles
...
They seem to stop Docker using its build cache.
Removing the line entirely stops weaveproxy from working, as it
assumes it can exec `./weave` from the current directory.
2017-03-06 11:29:09 +00:00
Martynas Pumputis
3607cf2d7a
Add check for xt_set module
...
The check is based on actually trying to install an iptables rule
which uses the module.
2017-03-01 10:37:43 +00:00
Martynas Pumputis
a57cf4bc83
Ignore modprobe errors in weave-kube/launch.sh
...
weave-kube is run by alpine image which uses busybox. modprobe of
busybox will return the "module not found" error [1], if a module is
built-in, which is an opposite behavior to modprobe distributed in
mainstream distros (e.g. ubuntu).
[1]: https://bugs.busybox.net/show_bug.cgi?id=5270
2017-02-28 11:26:40 +00:00
Bryan Boreham
cb73cf3f51
Ensure we have the kernel modules loaded for weave-npc
2017-02-27 12:32:57 +00:00
Martynas Pumputis
7a3e8e64b7
Merge pull request #2810 from ocadotechnology/add-pending-metrics
...
Add prometheus metrics for pending Allocates and Claims
2017-02-24 15:55:39 +00:00
Bryan Boreham
f7c0da3ae1
Merge pull request #2781 from keontang/luanch-update
...
Add CONN_LIMIT environment var for running container
2017-02-23 12:40:01 +00:00
Mike Bryant
fad537cad7
Add prometheus metrics for pending Allocates and Claims
2017-02-23 11:41:07 +00:00
Martynas Pumputis
32d44e09a1
Merge pull request #2787 from weaveworks/issues/2784-preclaim-addresses
...
Claim existing IP addresses at startup with no race condition
Fixes #2784
2017-02-13 17:51:38 +00:00
Bryan Boreham
7075b5d9fd
Extend pre-existing address reclaim to docker containers
2017-02-13 11:30:34 +00:00
Bryan Boreham
e26dbf11e9
Stop collecting addresses in launch script now we do it in Go
2017-02-10 15:11:14 +00:00
Bryan Boreham
39ac1a0037
Collect existing weave addresses at start-up, to avoid a race when
...
doing it from the script
Note we need to run weaver in the host pid namespace, so it can search
for existing container IPs. Also now we are firing off sub-processes
it's better to not be PID 1 so Linux doesn't expect us to reap zombies.
2017-02-10 15:10:02 +00:00
Jiyuan Tang
bee031ad70
Add CONN_LIMIT environment for running container
2017-02-09 19:34:16 +08:00
Adam Harrison
defa5cc3d3
Handle cache.DeleteFinalStateUnknown
2017-02-08 12:48:32 +00:00
Martynas Pumputis
5278eb7ebc
Merge pull request #2747 from weaveworks/issues/2689-npc-mcast-simple
...
Add rule to allow multicast at top level
2017-02-01 18:20:38 +00:00
Martynas Pumputis
60323d0960
Add fastdp crypto
2017-01-31 17:21:01 +00:00
Marc CARRE
ee659d4033
Replace weave/common/mflagext with common/mflagext.
...
Removes duplication between weave and common and reduces the amount of sources to compile.
2017-01-31 10:49:29 +00:00
Marc CARRE
8f9b2a36c0
Remove dep. on docker and use mflag from common.
...
This reduces the number of dependencies, and avoids having docker as a vendored dependency, which should speed the build up.
2017-01-31 10:30:12 +00:00
Tom Wilkie
590a151bde
Move signal handling loop to common.
2017-01-26 17:55:19 +00:00
Lucas Käldström
29eee4e858
Fixing review feedback, adding checksums, etc
2017-01-24 17:24:04 +02:00
Lucas Käldström
454c6f713d
Make Weave Net multi-architecture and add support for ARM and ARM 64-bit
2017-01-24 17:23:00 +02:00
Bryan Boreham
f067c7d44e
Add rule to allow multicast at top level
2017-01-23 12:11:44 +00:00
Adam Harrison
57a250a20b
Pin alpine container version
2017-01-16 12:27:53 +00:00
Bryan Boreham
7d308a4ac5
Wire weaveutil unique-id into weave script
...
Also ensure the right host directories are mounted when create-bridge
is called from either the weave script or weave-kube.
2017-01-11 13:14:35 +00:00
Bryan Boreham
ebcb7f6108
Use persisted peer name if it matches old-style ID
2017-01-11 13:14:35 +00:00
Bryan Boreham
70a20b4d26
Generate peer name / mac address in Go
2017-01-11 13:12:30 +00:00
Bryan Boreham
d143470d77
Refactor: extract db filename to a constant
2017-01-11 13:05:25 +00:00
Bryan Boreham
bf59a003bb
Exec weaver from weave-kube launch rather than running in background
...
So we only have one process running inside the container after all
set-up is finished
2017-01-04 15:00:52 +00:00
Adam Harrison
61d22bb8b4
Merge pull request #2686 from weaveworks/issues/2580-allow-ips
...
Allow docker bridge to have more than one IP address
2017-01-04 14:35:48 +00:00
Adam Harrison
eb3bbff883
Merge pull request #2708 from weaveworks/weave-kube-mounts
...
Mount /etc under a different path for weave-kube
2017-01-04 10:15:54 +00:00
Lucas Käldström
17971a5a3a
Remove the deprecated MAINTAINER field in Dockerfiles for LABEL maintainer instead
...
Also add https://microbadger.com/labels labels and remove LABEL fields where they already are inherited
2016-12-23 14:57:02 +02:00
Bryan Boreham
ea014d1362
Reimplement docker_bridge_ip shell pipeline in Go
2016-12-23 12:10:26 +00:00
Bryan Boreham
a4ad66f1c8
Mount /etc under a different path for weave-kube
...
So we don't accidentally read or write the hosts's /etc.
Also move the other volumes under /host to be more consistent with
what the weave script expects.
2016-12-22 10:35:47 +00:00
Martynas Pumputis
8affa26858
Merge pull request #2695 from weaveworks/issues/2692-consistent-npc-log
...
Change rest of npc to weave common logging
Fixes #2692
2016-12-19 16:41:27 +02:00
Martynas Pumputis
856cb48170
Merge pull request #2685 from weaveworks/issues/2480-correct-mac
...
Take peerName from weave bridge if not specified
Fixes #2480
2016-12-19 16:35:15 +02:00
Bryan Boreham
9261d17dbe
Fix option name
2016-12-13 14:59:45 +00:00
Martynas Pumputis
52f375ac1e
Merge pull request #2663 from weaveworks/issues/2389-report-mtu
...
Add MTU to connection status
Fixes #2389
2016-12-13 11:53:39 +00:00
Bryan Boreham
bbd631f08f
weave-kube no longer needs to supply the peer address
2016-12-09 15:34:31 +00:00