Commit Graph

35 Commits

Author SHA1 Message Date
Daniel Hiltgen 3661b6e63b Add TLS support for libkv
This adds TLS support into the KV store for swarm.  The manage, join,
and list commands all have a new CLI argument, matching the docker engine
discovery backend.  This required adding the tlsconfig utility
package from docker engine.

Here's an example showing re-use of the cluster certs for the KV store:

    swarm manage --tlsverify \
        --tlscacert /etc/docker/ssl/ca.pem
        --tlscert /etc/docker/ssl/cert.pem
        --tlskey /etc/docker/ssl/key.pem
        --discovery-opt kv.cacertfile=/etc/docker/ssl/ca.pem
        --discovery-opt kv.certfile=/etc/docker/ssl/cert.pem
        --discovery-opt kv.keyfile=/etc/docker/ssl/key.pem
        --advertise 192.168.122.47:3376
        etcd://192.168.122.47:2379

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-10-12 13:33:08 -07:00
Alexandre Beslic 814a8168ee update libkv godeps, fix zookeeper discovery list
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-07-04 18:37:13 -07:00
Alexandre Beslic 03a7be2919 fix issue with zookeeper and occasional SOH character return
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-30 14:04:05 -07:00
Alexandre Beslic b8d72c291d Cleanup, fix Integration tests and use of a single global Session in Consul
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 15:27:39 -07:00
Alexandre Beslic f81de46ab4 Fix Consul and etcd with latest changes, use etcd v2.0.11 for integration tests, remove call to SyncCluster for now (breaks the integration tests)
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 10:25:31 -07:00
Andrea Luzzardi 08dc3c7c7b discovery: Add the Entries.Diff helper.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:54:51 -07:00
Andrea Luzzardi 9399a8835c golint fixes.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi 0c72bcaf40 discovery cleanup: heartbeat is a time.Duration.
- Use a time.Duration instead of a uint64 for hb
- Flags can accept durations: --heartbeat 25s

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi f33c03af93 discovery: Push watch errors to a channel
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:14 -07:00
Andrea Luzzardi 97984881c3 discovery: New channel based API.
- Watch() issues updates by channel rather than by callback
- Fetch() is gone
- Watch() can be stopped at any time by closing the stop channel
- Watch() is now resilient to errors and will try over and over

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-18 13:38:13 -07:00
Kelsey Hightower 0d87489773 discovery: improve code comments.
Signed-off-by: Kelsey Hightower <kelsey.hightower@gmail.com>
2015-05-14 08:49:40 -07:00
Andrea Luzzardi d492feb7cc golint: DiscoveryService -> Discovery
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-04-15 14:26:39 -07:00
Sriram Natarajan b174aa26de Change heartbeat type to unsigned int
Check if heartbeat value is greater than zero

Signed-off-by: Sriram Natarajan <natarajan.sriram@gmail.com>
2015-04-09 00:04:50 +00:00
Matt Bajor d87c48ae4e Fix lint violations
This changeset fixes all lint violations that show up with a
min_confidence of 1

- Issue #500: Run golint on codebase

Signed-off-by: Matt Bajor <matt@notevenremotelydorky.com>
2015-03-27 21:17:44 -06:00
Ferran Rodenas cecdd7df02 Ignore empty addresses when creating discovery entries
Signed-off-by: Ferran Rodenas <frodenas@gmail.com>
2015-02-24 22:10:31 -08:00
Victor Vieux 3df8bbed61 refactor createEntries
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-10 02:25:38 +00:00
Victor Vieux ba01634743 replace discovery.Node by discovery.Entry
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-10 01:58:43 +00:00
Victor Vieux 231ded20e0 improve some logs
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-26 23:41:56 +00:00
Brian Goff a916f9cde0 Fixes panic when ports are not specified
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-23 15:56:14 -05:00
Victor Vieux 1581dcff6c support hostname without nodes://
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-23 10:42:20 -08:00
Victor Vieux f8825b644b rename list to nodes
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-13 19:56:53 +00:00
Victor Vieux 429965c58d ip:port, no proto or scheme
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-08 22:12:41 +00:00
Andrea Luzzardi 6a34054e58 Typo: Initialise -> Initialize.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-05 07:32:57 -08:00
Victor Vieux 98015c6e62 remove useless create fct
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 01:21:38 +00:00
Victor Vieux d6baf8bbe2 add a few tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 01:18:45 +00:00
Victor Vieux e2b6f00c23 WatchCallback
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-13 01:04:16 +00:00
Victor Vieux f2ca549f46 cleaner callback
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-12 22:49:20 +00:00
Victor Vieux 005b5fe288 watch take a callback 2014-12-12 22:14:11 +00:00
Victor Vieux 1f9eac7fd1 Initialize in the interface
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 23:23:10 +00:00
Victor Vieux f95f943b4a use 1.5*heartbeat as TTL in etcd
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 22:18:54 +00:00
Victor Vieux 2282fc89ef add node type
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 21:59:01 +00:00
Victor Vieux f04af68d3f update file 2014-12-11 01:24:19 +00:00
Victor Vieux 0aeb1771bd add watch interface 2014-12-11 01:24:19 +00:00
Victor Vieux ef9b509d07 add file
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 01:24:19 +00:00
Victor Vieux bb7f69fd9c First step toward modular discoevery services
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-11 01:24:19 +00:00