Bryan Boreham
992b4a65df
Refactor creation of base iptables rules
2017-05-19 15:17:20 +00:00
Bryan Boreham
6928929bc9
Install rules allowing outward traffic in npc mode
2017-05-19 15:16:02 +00:00
Bryan Boreham
508b424234
Add test for outward traffic from weave-kube
2017-05-19 15:16:02 +00:00
Marc Carré
7f68a96f75
Merge pull request #2918 from weaveworks/network-tester
...
Add a network test that isn't ping
2017-05-19 16:15:17 +01:00
Bryan Boreham
535e22e5f8
Wait for nodes to be ready before starting pods
...
Otherwise we can schedule all pods on the same node, which isn't such a good test
2017-05-19 11:47:57 +00:00
Bryan Boreham
348a926af4
Use network-tester image in Kubernetes test
2017-05-19 11:47:57 +00:00
Bryan Boreham
aa84c4788a
Add a network test that isn't ping
2017-05-19 11:47:57 +00:00
Bryan Boreham
66293e8caa
Factor out 'wait_for_x' loop to reduce duplication
2017-05-19 11:47:57 +00:00
Marc Carré
1e60cff2ef
Merge pull request #2977 from weaveworks/issues/2975-chain-race
...
Don't clear WEAVE-NPC chain in weaver
2017-05-18 11:22:10 +01:00
Bryan Boreham
701519a15c
Merge branch '1.9'
2017-05-18 10:18:39 +00:00
Bryan Boreham
72532324ed
Give up on versioned copy of shfmt; it doesn't build
2017-05-18 10:18:11 +00:00
Bryan Boreham
3cb6569d55
Don't clear WEAVE-NPC chain here; it is controlled by weave-npc.
...
We don't get a very useful error object back from go-iptables and I
didn't feel like parsing the message, so just ignore all errors.
It would be racy to try to check if WEAVE-NPC existed before calling
NewChain.
2017-05-18 09:29:33 +00:00
Bryan Boreham
af246225a9
Merge pull request #2974 from weaveworks/issues/net-plugin-makefile
...
Do not remove sigproxy and docker from net-plugin build image
2017-05-17 11:28:07 +01:00
Martynas Pumputis
582a792c71
Merge pull request #2966 from weaveworks/issues/2956-simplify-running
...
Simplify checks for plugin running
Fixes #2956 #2709
2017-05-17 12:56:31 +03:00
Martynas Pumputis
98c4bd9ee5
Do not remove sigproxy and docker from net-plugin build img
...
The #2954 PR has changed the base image of weaveworks/weave which no
longer includes sigproxy and docker client.
2017-05-17 12:45:20 +03:00
Bryan Boreham
933b395de4
Report plugin version status via the Config object
2017-05-17 09:28:34 +00:00
Bryan Boreham
4f485f856b
Factor out Plugin variables into Plugin and plugin.Config structs
2017-05-17 09:27:40 +00:00
Bryan Boreham
280651da9c
Create constant for 'weave' network name and move inside if-statement for weavemesh
2017-05-17 09:27:40 +00:00
Bryan Boreham
77201e949d
Don't check if weave is running in protect_against_docker_hang
...
Since it is only called in contexts where we have already checked that.
We don't need the detail of whether plugin is enabled; if it's not
running then it's ok to remove those socket files.
2017-05-17 09:27:40 +00:00
Bryan Boreham
292a50a891
Don't check if the plugin is enabled before trying to remove the default 'weave network'
...
If the plugin wasn't enabled then that network shouldn't exist.
If the network 'weave' doesn't exist then util_op remove-plugin-network will do nothing.
If it does exist for some reason then docker will pause for a while and remove it anyway.
2017-05-17 09:27:40 +00:00
Bryan Boreham
a36fc867d1
Formatting of status message
2017-05-17 09:27:39 +00:00
Bryan Boreham
def9f2d407
Check if weave is running for any reason before launching
2017-05-17 09:27:39 +00:00
Bryan Boreham
b0da4f6b91
Move proxy and plugin status from shell to Go
...
In the process we stop printing out the `PLUGIN_FULL_NAME`, but that
is assumed to be something the user can figure out from `docker plugin ls`
2017-05-17 09:27:22 +00:00
Marc Carré
71d6e881f2
Merge pull request #2954 from weaveworks/issues/2953-reorg-images
...
Issues/2953 reorg images
2017-05-15 16:25:58 +01:00
Marc Carré
da40771739
Merge pull request #2963 from weaveworks/issues/net-plugin-latest-release-tag
...
Use :latest_release tag for net-plugin
2017-05-15 16:06:12 +01:00
Martynas Pumputis
694314cc00
Use :latest_release tag for net-plugin
...
As for some reasons Docker Store does not allow us to use :latest.
2017-05-15 15:38:21 +01:00
Bryan Boreham
3025738377
Extract pluginNameFromAddress() function
2017-05-15 13:33:17 +00:00
Bryan Boreham
cbe0f4e6e5
Merge branch '1.9'
2017-05-15 12:44:08 +00:00
Marc Carré
68106d804e
Merge pull request #2959 from ocadotechnology/wip-2958
...
fix(npc): create ipsets with only valid xml characters
2017-05-15 13:30:10 +01:00
Marc Carré
e0088e0252
Merge pull request #2960 from weaveworks/remove-proxy-status-sock
...
Remove proxy status.sock
2017-05-15 13:26:25 +01:00
Bryan Boreham
efff6d6e63
Merge pull request #2962 from weaveworks/fix-shfmt-lint-error
...
Fix shfmt lint error by escaping $ in sed expression
2017-05-15 13:21:12 +01:00
Marc CARRE
6bbd8d7a4c
Escape $ in sed expression.
...
This fixes new error raised by latest version of shfmt, leading to build failures.
2017-05-15 12:36:55 +01:00
Bryan Boreham
e0bb49aa23
Don't crash on nil proxy in StatusHTTP
2017-05-15 11:32:20 +00:00
Bryan Boreham
81d79a64e6
Blank proxy_addrs should be a failure
2017-05-15 11:31:14 +00:00
stuart.warren
9cbf0289d8
fix(npc): create ipsets with only valid xml characters
...
Why:
* xml output of ipset is invalid because ipset itself doesn't appear to
escape invalid chars
* fixes #2958
2017-05-15 11:20:04 +01:00
Bryan Boreham
4f08879321
Multiple proxy addresses need to be all on one line
...
For some reason the previous version was de-newlined by the shell and
the new version isn't. Since I can't figure out the exact reason the
shell is now behaving differently (man page says it depends on the
quoting that is in effect) I brute-force it with 'tr'.
2017-05-15 10:17:35 +00:00
Bryan Boreham
6d6394c408
Don't say 'stop-router' in error message
2017-05-15 09:55:46 +00:00
Bryan Boreham
bf3ecaf48a
Remove proxy status.sock
2017-05-13 16:31:16 +01:00
Bryan Boreham
6ba2bf80b8
Remove some duplication between stop and reset
2017-05-13 16:14:02 +01:00
Bryan Boreham
9f4030cdb6
Move AWSVPC/IPAM check to Go code
...
The weave script check was broken in an earlier commit.
The Go error message is less specific because it checks more cases.
2017-05-13 14:34:29 +01:00
Bryan Boreham
cce818995a
Remove unused variable
2017-05-13 14:34:18 +01:00
Bryan Boreham
1e2dc43df6
Don't check docker version when run --local
...
The standard case for --local is when the weave script in the weaveexec container
is run by the weave script, which has just checked the version.
--local is also used from weave-kube where we don't mount the docker socket and
therefore cannot check.
Since --local is undocumented we will not worry about any other cases; the worst
that can happen is a confusing error message.
2017-05-13 13:52:42 +01:00
Bryan Boreham
06caf03d70
Need the workdir for weave container too
2017-05-12 16:51:39 +00:00
Bryan Boreham
7226b26e8e
Reorganise Docker image layers to slim weave-kube
2017-05-12 15:50:57 +00:00
Marc Carré
7c72d69e2f
Merge pull request #2951 from weaveworks/cleanup-args
...
Clean up some argument parsing in weave script
2017-05-12 14:49:43 +01:00
Marc Carré
bc1d6c47ba
Merge pull request #2947 from weaveworks/issues/1940-remove-proxy-attach-dep
...
Attach containers from Proxy using Go code
2017-05-12 14:49:20 +01:00
Bryan Boreham
8ec0e025d3
Don't need to parse --no-restart twice
2017-05-12 13:25:50 +00:00
Bryan Boreham
9f40d913c9
No special parsing needed for plugin argument
2017-05-12 13:24:59 +00:00
Bryan Boreham
3595c71d8b
No special parsing needed for DNS arguments
2017-05-12 13:24:39 +00:00
Bryan Boreham
9740478151
Merge pull request #2950 from weaveworks/issues/better-plugin-v2-detection
...
Better plugin-v2 detection
2017-05-12 13:31:01 +01:00
Bryan Boreham