Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Make address argument to weave dns-{add|remove} optional #1377

Closed
Closed
Changes from 1 commit
Commits
Show all changes
563 commits
Select commit Hold shift + click to select a range
854d83f
updating boot2docker docs for proxy
paulbellamy Jul 16, 2015
4d59445
Merge branch '1.0'
paulbellamy Jul 17, 2015
e03a4bb
updating boot2docker docs from 1.0 to master
paulbellamy Jul 17, 2015
25c9180
Don't swallow errors in the docker client.
Jul 17, 2015
ba3451e
Merge pull request #1180 from weaveworks/1171-210-failures
tomwilkie Jul 17, 2015
68afbe3
Shrink image file size
bboreham Jul 17, 2015
a3d3206
Correctly stop the test gossip router to prevent complaints of data r…
Jul 17, 2015
e2a2a8f
Merge branch '1.0'
rade Jul 17, 2015
2a1f090
Merge pull request #1183 from weaveworks/1181-data-race
bboreham Jul 17, 2015
64408b1
`weave launch-router` wasn't returning the correct container id
rade Jul 19, 2015
7c17c8a
refactor: simplify router arg parsing
rade Jul 19, 2015
5b62b8c
refactor: inline populate_dns
rade Jul 19, 2015
fafaeef
introduce --no-dns option
rade Jul 19, 2015
ae23488
disable dns in multiweave
rade Jul 19, 2015
4e56247
Merge pull request #1193 from weaveworks/disable_dns_in_multiweave
tomwilkie Jul 20, 2015
5baddb8
Comment out failing test until we figure out what to do.
Jul 20, 2015
7b9e598
test upload_executable helper should mkdir before uploading
paulbellamy Jul 20, 2015
a9229b9
weave env should still work with '--log-level=debug'
paulbellamy Jul 20, 2015
66473e6
refactor: return slice instead of pointer to slice from tombstone()
rade Jul 20, 2015
9ab2da8
Add GET /name handler to return all dns entries (including tombstones…
Jul 20, 2015
1a4b38a
Don't delete all the non-tombstone entries every 10mins!
Jul 20, 2015
f1b5a00
Merge pull request #1195 from weaveworks/1177-dns-disappear
rade Jul 20, 2015
4e29dba
Make Gossip DNS reject gossip messages if clockskew > tombstoneTimeou…
Jul 17, 2015
90b7c36
Merge pull request #1176 from weaveworks/1156-gossip-timestamp
bboreham Jul 20, 2015
11663dd
[proxy] rewrote chunked response handler
paulbellamy Jul 10, 2015
c44c61d
Merge branch '1103-proxy-chunking' of github.com:weaveworks/weave int…
squaremo Jul 20, 2015
2a9c3fc
Merge branch 'pr1112'
squaremo Jul 20, 2015
9131b46
Flush gossip messages after each turn, to ensure there isn't a build …
Jul 20, 2015
e34093c
Merge pull request #1197 from weaveworks/1158-flaky
bboreham Jul 20, 2015
a9dae46
When running unit tests, output coverage for imported modules.
Jul 20, 2015
4c9b0be
Merge pull request #1198 from weaveworks/1146-coverage
tomwilkie Jul 20, 2015
ad4e4ce
refactor: make 'inner' encoder/decoder explicit
rade Jul 17, 2015
af049ef
refactor: s/SimpleTCP{Sender,Receiver}/GobTCP{Sender,Receiver}
rade Jul 17, 2015
6f8622a
replace outermost framing on tcp connection
rade Jul 17, 2015
0b7d462
enforce a message size limit
rade Jul 17, 2015
dba116b
Merge remote-tracking branch 'upstream/1.0'
paulbellamy Jul 21, 2015
2980586
Put timeout on nameserver test to try and expose #1203
Jul 21, 2015
3c107d6
Merge branch '1.0'
rade Jul 21, 2015
26dc83d
Merge weaveworks/519_remove_outermost_gob (PR #1189)
dpw Jul 21, 2015
647b755
Check manually-assigned addresses with IPAM to see if they clash
bboreham Jul 20, 2015
2f80f12
Fixed typo
inercia Jul 22, 2015
976641c
Reverted: Fixed typo
inercia Jul 22, 2015
9e6d08c
Put 2m timeout on all unit tests.
Jul 22, 2015
062a25a
Make unit test timeout 8mins.
Jul 22, 2015
a12d63b
Make ipam test less stressful, so it doesn't timeout.
Jul 22, 2015
aa4efd6
cosmetic: uncomment test the way ordained by emacs
rade Jul 22, 2015
f091522
Rename 'reclaim' to 'noErrorUnknown' which describes the behaviour be…
bboreham Jul 23, 2015
5389e31
Merge branch '687-detect-ipam-clash' of github.com:weaveworks/weave i…
squaremo Jul 27, 2015
34bb7ae
[circle] use new gce templates for docker 1.7.1
paulbellamy Jul 27, 2015
ed4fb14
Merge pull request #1214 from weaveworks/rebuild-gce-templates
paulbellamy Jul 27, 2015
ce37b62
Merge branch '1.0'
rade Jul 27, 2015
536ce99
re-enable test
rade Jul 27, 2015
a2e1a2d
Merge branch 'pr1200'
squaremo Jul 27, 2015
c883614
Remove misleading comment and lowercase deniedBy
squaremo Jul 27, 2015
9a91b3c
include directory of test code in coverage
rade Jul 27, 2015
e3f0565
Merge pull request #1221 from weaveworks/1220_include_test_dir_coverage
paulbellamy Jul 28, 2015
f861d22
do proper mock periodic gossip
rade Jul 28, 2015
9779e06
Extend scheduler to periodically garbage collect stranded VMs
tomwilkie Jul 28, 2015
10dbd9a
Merge pull request #1224 from weaveworks/1203_proper_mock_gossip
tomwilkie Jul 28, 2015
da7ac78
Don't try and init the ring if the IP address is not in our range.
Jul 28, 2015
88144ac
Review feedback
Jul 28, 2015
820307d
Merge pull request #1228 from weaveworks/1030-150-connect-forget
rade Jul 28, 2015
792c4c8
Merge pull request #1227 from weaveworks/gce-gc
paulbellamy Jul 28, 2015
db6ee99
Allow users to set dns listen address so we can run the weave router …
Jul 28, 2015
1701bc3
Merge branch '1.0'
awh Jul 28, 2015
7735814
Merge pull request #1219 from squaremo/driveby
rade Jul 28, 2015
da36c78
Reduce the number of times gcs.sh ssh's into the VMs
May 29, 2015
e767697
Parallelise the copying of imaages etc
Jul 29, 2015
51128a6
Parallelise the copying of /etc/hosts.
Jul 29, 2015
4df3d7f
Reduce the amount of parallelism in the ipam tests
Jul 29, 2015
6fe6959
Add coverage to proxy for integration tests.
Jul 28, 2015
2d450ac
Merge pull request #1225 from weaveworks/21-dns-listen-addr
awh Jul 29, 2015
3bffd87
Merge pull request #1230 from weaveworks/1154-proxy-coverage
tomwilkie Jul 29, 2015
4da999b
Merge pull request #1235 from weaveworks/gce
paulbellamy Jul 29, 2015
669a0db
Run integration tests in parallel when possible.
Jul 29, 2015
27289e7
Merge pull request #1236 from weaveworks/1169-frugal-frugal-frugal
paulbellamy Jul 30, 2015
7282039
.gitignore Vim recovery files
awh Jul 30, 2015
fa95b67
Add summary to bottom of test runner output.
Jul 30, 2015
bfe07fc
Give each shard 5 VMs
Jul 30, 2015
5c9a13d
Shard 600_proxy_docker_py into 4.
Jul 30, 2015
a87be89
Typos. Honestly
Jul 30, 2015
dccd199
Merge pull request #1242 from weaveworks/1239-600-docker-py
paulbellamy Jul 30, 2015
9396c04
parameterize test/gce.sh so scope can override TEMPLATE_NAME and NUM_…
paulbellamy Jul 30, 2015
6a136ee
make parallel test running work locally
rade Jul 30, 2015
e3851e6
Merge pull request #1246 from weaveworks/gce-parameterize
paulbellamy Jul 30, 2015
f8327c3
expand test coverage to unicast relaying
rade Jul 30, 2015
b7e8938
scope the test runner call so scope works
paulbellamy Jul 30, 2015
55051f0
Merge remote-tracking branch 'upstream/1.0'
paulbellamy Jul 31, 2015
cc7b781
have testrunner summarize failed tests so they are easier to find
paulbellamy Jul 31, 2015
5a37f65
add -v to testrunner, and less output in happy path
paulbellamy Jul 31, 2015
ca89cfe
Merge pull request #1250 from paulbellamy/testrunner-summarize-fails
tomwilkie Jul 31, 2015
7d6f854
Move OnOff into router.go
dpw Aug 3, 2015
31c0506
Eliminate dotted imports of common for the sake of Log
dpw Aug 3, 2015
e7ee728
Log -> log
dpw Aug 3, 2015
778038f
Merge branch 'fix-dotted-imports-for-log' of https://github.com/dpw/w…
squaremo Aug 3, 2015
281bf02
Merge branch 'pr1254'
squaremo Aug 3, 2015
881ece3
Add note to explain dns shuffle effects.
Aug 4, 2015
f241e15
Review feedback
Aug 4, 2015
9c22066
Merge pull request #1256 from weaveworks/1245-dns-loadbalancing
rade Aug 4, 2015
1d1ebc1
Merge remote-tracking branch 'upstream/1.0'
paulbellamy Aug 4, 2015
b85b90e
Proxy chunking should handle arbitrarily large chunks
paulbellamy Aug 4, 2015
157910e
adding integration test for proxy handling large http chunks
paulbellamy Aug 5, 2015
de6f5a9
refactor: extract build flags
rade Aug 5, 2015
c47e57c
cosmetic
rade Aug 5, 2015
6cc7749
cosmetic: remove debug logging from test
rade Aug 5, 2015
7799615
Merge branch '1.0'
awh Aug 5, 2015
94db0be
don't save the python test file when running test/600
paulbellamy Aug 5, 2015
f9127e9
Merge pull request #1263 from weaveworks/integration-tests-no-save-file
tomwilkie Aug 5, 2015
457e162
Merge branch '1.0'
awh Aug 6, 2015
3180c67
-no-rewrite-hosts -> --no-rewrite-hosts
paulbellamy Aug 6, 2015
43ef3b8
give routers some time to establish connectivity
rade Aug 5, 2015
f556552
[proxy] rewrite /etc/hosts from outside the container
paulbellamy Aug 5, 2015
536369b
Merge pull request #1265 from weaveworks/1252-proxy-non-root-hosts
rade Aug 6, 2015
010792f
cosmetic: more sensible order of weave commands
rade Aug 7, 2015
1a11b98
simplify test
rade Aug 7, 2015
0a2701b
Merge pull request #1268 from weaveworks/1243_fix_claim_test
tomwilkie Aug 10, 2015
b2a24d1
Merge branch '1.0'
rade Aug 10, 2015
6d7e784
review feedback
paulbellamy Aug 10, 2015
fd2a594
cosmetic
rade Aug 10, 2015
0738369
Return NXDOMAIN when we don't have entries, and drop the non-authorit…
Aug 10, 2015
c2d5b35
Add test for negative DNS queries
Aug 10, 2015
42debde
Merge pull request #1259 from weaveworks/1257-proxy-chunking
tomwilkie Aug 10, 2015
755a949
Merge pull request #1277 from weaveworks/1275-negative-dns
rade Aug 10, 2015
94af02f
Merge branch '1.0'
rade Aug 10, 2015
cf6d6d0
add test for PMTU discovery and packet fragmentation
rade Jul 30, 2015
8bce900
Merge pull request #1247 from weaveworks/test_frag
rade Aug 10, 2015
278807a
Move router HTTP handlers into router/http.go
awh Jul 16, 2015
00ecff0
Move status HTTP handlers into prog/weaver/http.go
awh Jul 16, 2015
fc9a1c8
new `weave status`, `weave status ...`, and `weave report`
awh Jul 16, 2015
f3ad81d
Merge pull request #1248 from weaveworks/issues/1025-enhanced-weave-s…
awh Aug 11, 2015
7fa5688
Ensure we delete the fqdn is the container fails to start.
Aug 11, 2015
6a5044f
Make nameserver logging more consistent.
Aug 11, 2015
c1d799a
add pcap stats to `weave report`
rade Aug 11, 2015
f1b9cf4
Merge pull request #1282 from weaveworks/1281-dns-remove-dead-quick
rade Aug 11, 2015
c2147f8
Merge pull request #1283 from weaveworks/1185_report_pcap_stats
awh Aug 11, 2015
d0ed225
Merge branch '1.0'
rade Aug 11, 2015
7656752
unbreak test
rade Aug 12, 2015
45293fd
Move ListVar into common, so it can be reused elsewhere.
Aug 12, 2015
cdab6a7
Merge pull request #1289 from weaveworks/move-listvar
tomwilkie Aug 12, 2015
e319f54
Merge branch '1.0'
rade Aug 13, 2015
2bb84ae
Merge branch '1.0'
rade Aug 13, 2015
d5de0b4
Merge branch '1.0'
rade Aug 13, 2015
686500b
Merge branch '1.0'
rade Aug 13, 2015
26f4a41
Merge branch '1.0'
rade Aug 13, 2015
78df99e
Merge branch '1.0'
rade Aug 13, 2015
fa2aa1f
Merge branch '1.0'
rade Aug 13, 2015
eaa5385
refactor: use new proxy_start_container function
rade Aug 13, 2015
0de292c
[proxy] attach containers with --net=none to weave
paulbellamy Aug 14, 2015
9de7c9e
Merge pull request #1303 from weaveworks/1302-proxy-net-none
rade Aug 14, 2015
067f960
correct option name in log message
rade Aug 17, 2015
5fbcb3f
Add sudo apt-get update to circle.yml
Aug 17, 2015
0a80fdc
Merge pull request #1312 from weaveworks/circle
inercia Aug 17, 2015
8c9679b
Merge branch '1.0'
rade Aug 17, 2015
375af0a
Improve log messages for when the proxy ignores a container
rade Aug 17, 2015
74883c5
Merge pull request #1310 from weaveworks/improve_proxy_ignore_messages
paulbellamy Aug 17, 2015
74e29c8
Merge branch '1.0'
rade Aug 17, 2015
4f00dab
Compress recursive answers if they are too big.
Aug 16, 2015
67f9749
Test for recursive DNS queries & compression.
Aug 16, 2015
bbc91c1
Merge pull request #1307 from weaveworks/1306-dns-recurse-compress
rade Aug 17, 2015
d8e8cd6
don't reconnect to ourself
rade Aug 17, 2015
0e85783
cosmetic: add blank lines around `weave status` output
rade Aug 18, 2015
59859c4
clarify allocation subnet overlap failure
rade Aug 18, 2015
86b7e4a
Merge branch '1.0'
rade Aug 18, 2015
4ecaa0f
don't put blank lines around sub-status
rade Aug 18, 2015
acde6cb
We are not using gcloud, but it cause a conflict
errordeveloper Aug 18, 2015
f73dcba
eliminate spurious warning when --ipalloc-range=""
rade Aug 18, 2015
0b4e8b8
Merge pull request #1318 from weaveworks/1305_suppress_self_reconnection
bboreham Aug 18, 2015
c1c5450
more idiomatic logger initialisation, with standard default log level
rade Aug 18, 2015
5d14118
Merge branch '1.0'
rade Aug 18, 2015
0d79a8f
cosmetic
rade Aug 18, 2015
e1d07aa
cosmetic
rade Aug 18, 2015
a34b31a
refactor: make proxy_addr more single purpose
rade Aug 18, 2015
be94dcc
introduce `weave env --restore`
rade Aug 18, 2015
a93a3e9
warn when stopping proxy when the env is using it
rade Aug 18, 2015
db51b77
Merge pull request #1327 from weaveworks/1288_restore_env
bboreham Aug 19, 2015
29c64b1
document `weave env --restore`
rade Aug 19, 2015
99ab0d3
Merge branch '1.0'
rade Aug 19, 2015
f34f837
Merge branch '1.0'
rade Aug 19, 2015
4d49bf3
Add comment to clarify the reason why there is no explicit 'assert' t…
bboreham Aug 19, 2015
d61c719
cosmetic
rade Aug 19, 2015
f080e5a
Merge pull request #1331 from weaveworks/clarify-test-160
rade Aug 19, 2015
08f3188
better docker version check
rade Aug 18, 2015
812579a
Merge pull request #1326 from weaveworks/576_better_version_check
rade Aug 19, 2015
8ab639d
deal with `weave --help|help` locally
rade Aug 19, 2015
eebdbe2
Merge pull request #1325 from weaveworks/1322_handle_usage_locally
rade Aug 20, 2015
ceff3be
better error handling for invalid `weave status` sub-command
rade Aug 20, 2015
3803d79
Merge pull request #1335 from weaveworks/1328_handle_invalid_status_s…
awh Aug 20, 2015
df5426d
Check if we have any peers with entries, to avoid crash
bboreham Aug 20, 2015
aafa0f6
Merge pull request #1338 from weaveworks/1336-check-len
tomwilkie Aug 20, 2015
790a175
Revert "In ipam ring unit test, check if we have any peers with entri…
tomwilkie Aug 20, 2015
dac219b
Merge pull request #1339 from weaveworks/revert-1338-1336-check-len
tomwilkie Aug 20, 2015
8a7821a
Publish latest images from CI on successful builds.
Aug 20, 2015
1e83e7a
Merge branch '1.0'
awh Aug 20, 2015
f399c3a
Merge branch '1.0'
rade Aug 20, 2015
fd6d15e
eliminate misleading flag parsing error
rade Aug 20, 2015
b075e93
Merge pull request #1324 from weaveworks/1321_elminate_misleading_fla…
rade Aug 20, 2015
8182022
refactor dns handlers
rade Aug 20, 2015
69986e7
cosmetic
rade Aug 20, 2015
7c7c302
extract response construction
rade Aug 20, 2015
322441d
inline truncateResponse
rade Aug 20, 2015
2ea27ec
simplify response truncation
rade Aug 20, 2015
9a7abe6
optimise response construction when no truncation is required
rade Aug 20, 2015
0b5f5fd
extract response writing
rade Aug 20, 2015
31a490b
ensure that `make publish` publishes up-to-date images
rade Aug 21, 2015
2284bc2
move error response construction to handler
rade Aug 21, 2015
8516ab7
Unify logic to tell if DNS response is too big.
Aug 21, 2015
58dafbf
Merge pull request #1344 from weaveworks/refactor-dns-handlers
rade Aug 21, 2015
396df6b
Merge pull request #1348 from weaveworks/1345-1332-dns-response-size
rade Aug 21, 2015
ca94cff
Detect REJECT rule in FORWARD chain
awh Aug 21, 2015
5054805
Merge pull request #1337 from weaveworks/1295-push-on-green
paulbellamy Aug 24, 2015
130cf6e
need to be in gopath to run make publish
paulbellamy Aug 24, 2015
2673946
Escape a minus character to stop it being taken as a bullet, and clar…
bboreham Aug 24, 2015
75fb8f6
Revert "need to be in gopath to run make publish"
errordeveloper Aug 24, 2015
6d0db90
Revert "Merge pull request #1337 from weaveworks/1295-push-on-green"
errordeveloper Aug 24, 2015
4809c11
Update comment.
Aug 24, 2015
58ae0cd
Pass docker bridge ip to dns server, and filter it out of upstream dn…
Aug 24, 2015
760f419
Merge pull request #1354 from weaveworks/1347-dns-tombstone-comment
bboreham Aug 24, 2015
db2e7e4
Merge pull request #1355 from weaveworks/1343-docker-bridge-in-resolv…
tomwilkie Aug 25, 2015
bd19b86
Merge pull request #1352 from weaveworks/doc-format
squaremo Aug 25, 2015
46363f4
Make reverse dns lookups honor tombstones.
Aug 25, 2015
914c884
Review feedback
Aug 25, 2015
5289a38
Use $* instead of $@ to get the desired quoting
bboreham Aug 26, 2015
a1f5d90
Merge pull request #1363 from weaveworks/1362-fix-quoted-params
tomwilkie Aug 26, 2015
f5918a3
remove dead code
rade Aug 27, 2015
95379b0
Add works.weave.role=system label to weave containers.
Aug 12, 2015
42b64f8
Merge pull request #1358 from weaveworks/1357-dns-reverse-tombstone
tomwilkie Aug 27, 2015
8b5992e
Merge pull request #1290 from weaveworks/labels
squaremo Aug 27, 2015
6e89b03
Wait for ethwe via netlink, not via polling or signals
bboreham Jul 23, 2015
3d25620
In proxy, rewrite /etc/hosts from 'weave attach', via new utility wea…
bboreham Aug 14, 2015
2eed101
In weavewait, wait for the multicast route to be added before calling…
bboreham Aug 18, 2015
7801dcd
Factor out common loop receiving from netlink
bboreham Aug 27, 2015
6fce798
Factor out deserializeRoute() func
bboreham Aug 27, 2015
cdf4fb6
Merge branch '1.0'
rade Aug 27, 2015
6655974
cosmetic: tidy up log messages
rade Aug 28, 2015
1a9909e
also warn on `weave reset` when env's DOCKER_HOST points to proxy
rade Aug 28, 2015
244a679
Merge pull request #1349 from weaveworks/issues/1266-detect-adverse-f…
rade Aug 28, 2015
a45e5ac
Test calling 'start' with a HOST_CONFIG not supplied to 'create'
bboreham Aug 28, 2015
6291a89
Merge pull request #1314 from weaveworks/1209-wait-iface-netlink
rade Aug 28, 2015
8960a3a
Merge branch '1.0'
rade Aug 28, 2015
5483319
Call to docker-py changed upstream
bboreham Aug 27, 2015
176ee73
Ensure we have the busybox image
bboreham Aug 27, 2015
5c3efbd
Merge pull request #1366 from weaveworks/python-call-changed
rade Aug 28, 2015
a23c023
using --collect-only so we don't miss tests
paulbellamy Sep 1, 2015
cead957
document --no-rewrite-hosts flag
paulbellamy Sep 1, 2015
df25f84
Merge pull request #1375 from weaveworks/1373-document-no-rewrite-hosts
bboreham Sep 1, 2015
6a34995
Merge pull request #1370 from weaveworks/docker-py-test-matcher
bboreham Sep 1, 2015
3097565
Merge branch '1.0'
awh Sep 2, 2015
58ea422
Optional address argument to dns-add/dns-remove
awh Sep 1, 2015
1472e35
Update documentation
awh Sep 1, 2015
0125e67
Implement smoke test
awh Sep 1, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions nameserver/nameserver.go
Original file line number Diff line number Diff line change
@@ -134,21 +134,21 @@ func (n *Nameserver) ContainerDied(ident string) {
n.Lock()
entries := n.entries.tombstone(n.ourName, func(e *Entry) bool {
if e.ContainerID == ident {
n.infof("container %s died, tombstoning entry %s", ident, e.String())
n.infof("container %s died; tombstoning entry %s", ident, e.String())
return true
}
return false
})
n.Unlock()
if len(entries) > 0 {
if err := n.broadcastEntries(entries...); err != nil {
n.errorf("Failed to broadcast container '%s' death: %v", ident, err)
n.errorf("failed to broadcast container %s death: %v", ident, err)
}
}
}

func (n *Nameserver) PeerGone(peer *router.Peer) {
n.infof("peer gone %s", peer.String())
n.infof("peer %s gone", peer.String())
n.Lock()
defer n.Unlock()
n.entries.filter(func(e *Entry) bool {
@@ -158,7 +158,7 @@ func (n *Nameserver) PeerGone(peer *router.Peer) {

func (n *Nameserver) Delete(hostname, containerid, ipStr string, ip address.Address) error {
n.Lock()
n.infof("tombstoning hostname=%s, containerid=%s, ip=%s", hostname, containerid, ipStr)
n.infof("tombstoning hostname=%s, container=%s, ip=%s", hostname, containerid, ipStr)
entries := n.entries.tombstone(n.ourName, func(e *Entry) bool {
if hostname != "*" && e.Hostname != hostname {
return false