toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,919 Commits 3 Branches 295 Tags
79e3f2c2569bdc55c76a33d5347c576fa4e92865
Commit Graph

24 Commits

Author SHA1 Message Date
Aaron Lehmann
b141a44de0 Replace secrets with join tokens 
Implement the proposal from
https://github.com/docker/docker/issues/24430#issuecomment-233100121

Removes acceptance policy and secret in favor of an automatically
generated join token that combines the secret, CA hash, and
manager/worker role into a single opaque string.

Adds a docker swarm join-token subcommand to inspect and rotate the
tokens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2cc5bd33eef038bf5721582e2410ba459bb656e9
Component: engine
 2016-07-21 15:23:03 -07:00
Tõnis Tiigi
0938c99ecd Merge pull request #24563 from dperny/test-leader-election 
Added leader election test
Upstream-commit: ea59668046e1c842b311732fc280701da1056ace
Component: engine
 2016-07-20 16:02:09 -07:00
Dong Chen
6c22592de6 Test rolling update. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: d327765a62a99dc63e9a8c16ac291861cee066f3
Component: engine
 2016-07-19 12:09:30 -07:00
Drew Erny
35b05741e6 Added leader election test 
Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 3489e76513b76e6429075dbbcb6acb3341e42293
Component: engine
 2016-07-19 11:29:27 -07:00
Drew Erny
ecd1805a72 Added test for leader proxying 
Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: d305aa48ddcd17244ca408c59a40e2ef2392f414
Component: engine
 2016-07-18 13:18:02 -07:00
Tõnis Tiigi
f0e9eeb33f Merge pull request #24465 from LK4D4/restart_cluster_test 
integration-cli: add test for restarting entire swarm cluster
Upstream-commit: 08a2fd7e2e95c235225e796b8b6d4c89478394ea
Component: engine
 2016-07-12 13:12:33 -07:00
Ralf Sippl
944503693f Add API test for empty services list 
Signed-off-by: Ralf Sippl <ralf.sippl@gmail.com>
Upstream-commit: 65e72133a11ea3e6873f62039956bbd70548a5a7
Component: engine
 2016-07-12 17:31:44 +02:00
Alexander Morozov
b2f48d18dd integration-cli: add test for restarting entire swarm cluster 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ae4137ae3cc6ee479f5e7f86f9859b485473285a
Component: engine
 2016-07-11 14:48:57 -07:00
Tonis Tiigi
113ca78a6b Use waitAndAssert to test node state changes 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f02ec39e99bfd36f34a965f78d853e19234e513b
Component: engine
 2016-07-11 10:01:14 -07:00
Antonio Murdaca
dd59a5931c integration-cli: fix --net=none tests 
Example:

21:28:01 [d68573521] waiting for daemon to start
21:28:01 [d68573521] daemon started
21:28:01 docker_api_swarm_test.go:163:
21:28:01     c.Assert(d1.Init(map[string]bool{"worker": true}, ""),
checker.IsNil)
21:28:01 ... value *errors.errorString =
&errors.errorString{s:"initializing swarm: invalid statuscode 500,
\"{\\\"message\\\":\\\"could not determine local IP address: dial udp
8.8.8.8:53: connect: network is unreachable\\\"}\\n\"} ("initializing
swarm: invalid statuscode 500, \"{\\\"message\\\":\\\"could not
determine local IP address: dial udp 8.8.8.8:53: connect: network is
unreachable\\\"}\\n\"")
21:28:01
21:28:01 [d68573521] exiting daemon"}

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 9fadb8fd6a09c8982dc8a44125f4d21c33c8c394
Component: engine
 2016-07-10 15:56:02 +02:00
Tonis Tiigi
727d754fd1 Add more complicated demotion testcases 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a3f1577365f7b2ed99d1801c909bfaa69c048c92
Component: engine
 2016-07-08 13:33:40 -07:00
Justin Cormack
d93f3c954e Fix test case for docker_api_swarm_test.go 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 6dfba780cc490ef7579e95169b5c71617f8e5a47
Component: engine
 2016-07-07 21:01:55 +01:00
Tonis Tiigi
c644a729dc Add test for force-new-cluster 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1acb8ef82572c52994b1ff00fe5c86aac53be4b8
Component: engine
 2016-06-24 13:57:11 -07:00
Tonis Tiigi
76181c2413 Switch node management tests to api types 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 22b34d64496c9b6ebae5e2b4a98ecd9a172cc557
Component: engine
 2016-06-24 11:51:43 -07:00
Tonis Tiigi
4bcb0e068c Increase test timeouts for node state changes 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2e5da4434126309f2395cc3d5b2013674155ae5c
Component: engine
 2016-06-23 17:30:42 -07:00
Tonis Tiigi
8c9dd4362c Unify swarm init and update options 
Add api side validation and defaults for init and
join requests.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
 2016-06-21 16:34:32 -07:00
Tonis Tiigi
20fc079713 Don’t try to restore swarm from incomplete state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ded1d9af38cb467dadab0521936174eef0d4bc9e
Component: engine
 2016-06-18 19:43:47 -07:00
Arnaud Porterie
79ea0079e7 Merge pull request #23644 from tonistiigi/fix-leave-delete 
Fix removing containers on leaving from pending state
Upstream-commit: f4de3f314e1e965056447d5ea6203ca4b66bb6e0
Component: engine
 2016-06-17 01:40:45 +00:00
Tonis Tiigi
dae11af952 Fix removing containers on leaving from pending state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 826f6f07031abc4dea6f71ed69d33a4e0789ee11
Component: engine
 2016-06-16 16:08:15 -07:00
Tonis Tiigi
10f6f936be Return membership status on join without timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1973cee0cd86da3c7b7002a3fed7af2557df538c
Component: engine
 2016-06-16 15:27:08 -07:00
Tonis Tiigi
f2801c549b Add api tests for secret update 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: aed7667bee243b0e0d1aa480e3bb52bae894cfe5
Component: engine
 2016-06-16 13:21:55 -07:00
Tonis Tiigi
db7d3c4eb4 Update drain test 
With the rolling update there can be a possibility
that the container count matches the update has
completely finished yet.

The actual bug for the flakiness was fixed with the
swarmkit update.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b38408fd0287a5d6eda4f8083b83806faf5d5cbd
Component: engine
 2016-06-14 17:25:17 -07:00
Tonis Tiigi
bd9cd01452 Temporarily skip flaky part of the drain test 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 32f18616c70c52298ea7e07529acba852aa87c86
Component: engine
 2016-06-14 10:20:40 -07:00
Tonis Tiigi
7a33d63cb2 Swarm integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0d88d5b64b69a451d374e322b2abe64140a6cd1c
Component: engine
 2016-06-13 22:16:18 -07:00