Commit Graph

40 Commits

Author SHA1 Message Date
7d67a90c9e Bump swarmkit
Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 1222a7081ac9ebb0830a6c8008142258c49800b5
Component: engine
2018-10-22 15:10:20 -05:00
47296e79f8 vendor: remove boltdb dependency which is superseded by bbolt
This also brings in these PRs from swarmkit:
- https://github.com/docker/swarmkit/pull/2691
- https://github.com/docker/swarmkit/pull/2744
- https://github.com/docker/swarmkit/pull/2732
- https://github.com/docker/swarmkit/pull/2729
- https://github.com/docker/swarmkit/pull/2748

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: cce1763d57b5c8fc446b0863517bb5313e7e53be
Component: engine
2018-09-22 01:24:11 +00:00
c9c36cf7eb Global Default Address Pool feature support
This feature allows user to specify list of subnets for global
default address pool. User can configure subnet list using
'swarm init' command. Daemon passes the information to swarmkit.
We validate the information in swarmkit, then store it in cluster
object. when IPAM init is called, we pass subnet list to IPAM driver.

Signed-off-by: selansen <elango.siva@docker.com>
Upstream-commit: f7ad95cab9cc7ba8925673a933028d53284c13f5
Component: engine
2018-08-20 15:07:08 -04:00
a972373b51 Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64f
Relevant changes;

- swarmkit #2593 agent: return error when failing to apply network key
- swarmkit #2645 Replace deprecated grpc functions
- swarmkit #2720 Test if error is nil before to log it
- swarmkit #2712 [orchestrator] Fix task sorting
- swarmkit #2677 [manager/orchestrator/reaper] Fix the condition used for skipping over running tasks

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 660fa129c0ea09c1aa1770b5f2d26ec762213484
Component: engine
2018-08-03 18:55:53 +02:00
60c800804e Update containerd to 1.1
Updates swarmkit, grpc, and all related vendors

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 52ed3e0896c203013388a3eb603658f345a9d80a
Component: engine
2018-06-04 15:37:03 -07:00
c48e2f3808 Bump SwarmKit to 9c2aa152c3054371b833483a7ddad8d15052ec4f
Relevant changes:

- docker/swarmkit#2551 RoleManager will remove deleted nodes from the cluster membership
- docker/swarmkit#2574 Scheduler/TaskReaper: handle unassigned tasks marked for shutdown
- docker/swarmkit#2561 Avoid predefined error log
- docker/swarmkit#2557 Task reaper should delete tasks with removed slots that were not yet assigned
- docker/swarmkit#2587 [fips] Agent reports FIPS status
- docker/swarmkit#2603 Fix manager/state/store.timedMutex

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 333b2f28fef4ba857905e7263e7b9bbbf7c522fc
Component: engine
2018-04-17 13:44:49 -07:00
314f0caa92 Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff
Changes included:

- Ingress network should not be attachable
- [manager/state] Add fernet as an option for raft encryption
- Log GRPC server errors
- Log leadership changes at manager level
- [state/raft] Increase raft ElectionTick to 10xHeartbeatTick
- Remove the containerd executor
- agent: backoff session when no remotes are available
- [ca/manager] Remove root CA key encryption support entirely
- Fix agent logging race (fixes https://github.com/docker/swarmkit/issues/2576)
- Adding logic to restore networks in order

Also adds github.com/fernet/fernet-go as a new dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 27749659d5a30999691e401a351221780a483099
Component: engine
2018-04-02 15:17:38 -07:00
7179b03d8b Bump SwarmKit to f74983e7c015a38a81c8642803a78b8322cf7eac
- Replace EC Private Key with PKCS#8 PEMs
- Fix IP overlap with empty EndpointSpec
- Add support for Support SCTP port mapping (depends on changes in libnetwork)
- [orchestrator/updater] Do not reschedule tasks if only placement constraints change and are satisfied by the assigned node
- Ensure task reaper stopChan is closed no more than once
- [manager/dispatcher] Synchronization fixes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 191324b8f1e1a2b2dbe692f869bfbf525d150ade
Component: engine
2018-02-09 18:39:49 -08:00
e96b772de5 Swarmkit vendoring.
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
Upstream-commit: 9fdbb32fcee24410c64c7897c0d9667202aa7e4f
Component: engine
2017-12-05 14:27:49 -08:00
fa385958f4 vndr swarmkit 941a01844b89c56aa61086fecb167ab3af1de22b
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
Upstream-commit: 8e15b1cffb95d1e82943a628353c6df7cd54f6c4
Component: engine
2017-09-26 22:08:10 +00:00
3fa5ba0a1e plugable secret backend - update vendor.conf
Updating swarmkit dependencies.

Add more parameters for the secret driver API.

Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: 3b8d36d0646137c4315cfa12df0dcd49b584d22a
Component: engine
2017-08-18 21:52:26 +03:00
ed4f0879cf Update imports for logrus version
Add forks for changes which only make logrus change without functional
change.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 4f3616fb1c112e206b88cb7a9922bf49067a7756
Component: engine
2017-07-31 13:19:38 -07:00
ed052d78fd pluggable secret backend
This commit extends SwarmKit secret management with pluggable secret
backends support.

Updating the work in
[swarmkit](docker/swarmkit@eebac27434) for
pluggable secret backend and adding the
driver parameter to `SecretSpec`.

Remaining work:
- [ ] CLI support (docker/cli)
- [ ] api in [plugin helpers](docker/go-plugins-helpers))
- [ ] Reference plugin
- [ ] Documenation (after cli work)

Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: 7d45cafd5746e847e58078aa2fbdde57b5f49fa4
Component: engine
2017-07-15 16:50:02 +03:00
61e4b54502 Vendor swarmkit 79381d0
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 79b940feee9cf18893ead7269cfd59ec41bd7297
Component: engine
2017-06-21 15:32:53 -07:00
f104371302 Vendor swarmkit a4bf013
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 32d7b0f3601258edf94ecf0e2e9018a406846888
Component: engine
2017-06-12 10:31:11 -07:00
a66a7ebd10 Vendor swarmkit @998a47f
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 8daeeacfc1126eafb2b6d00e2dc6e2f5a6ed78cc
Component: engine
2017-05-17 15:50:28 -07:00
7538411c99 Vendor swarmkit ae29cf2
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 721b7a7fadb7f43be4e9b1658ae76e6c91067dbf
Component: engine
2017-05-12 17:36:11 -07:00
4356b71651 Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 1b68641fc8fe0767aba510ec04fdc1dd221e5d0c
Component: engine
2017-05-05 14:18:12 -07:00
a8cbf4d0f4 Re-vendor swarmkit to a version which does not require all cluster updates
to include an external CA certificate when updating external CAs.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: e34bee387e0cba0da36b2c4b9113907933c32710
Component: engine
2017-04-12 16:55:47 -07:00
7647ce4c36 Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 367b57d9859d2e3b4a651eb31d2d17f425329783
Component: engine
2017-04-05 18:49:23 -07:00
214de28cc7 Vendoring swarmkit @b74ec2b
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 747f0b4ba52b25a4ede0d54cb1674f221ea3e2ed
Component: engine
2017-03-30 16:12:33 -07:00
9345697f56 vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: aac861f3d9d0a38d9bcc4e11d56ef9648bb1f79e
Component: engine
2017-03-28 11:51:33 -07:00
c2f1681e6f Vendoring swarmkit @9fdea50
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 434e9695e42f9399c627d433972dbd73f7c8502f
Component: engine
2017-03-24 11:07:33 -07:00
281516f8c3 Vendor swarmkit 0e2d9eb
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 79bf23845b7829bf68b9dda47af46886b274ac78
Component: engine
2017-03-10 11:15:44 -08:00
9b41265701 Vendor swarmkit d60ccf3
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 39433318fe224e9066a892fc5834b38649ec86ac
Component: engine
2017-03-07 19:09:21 -08:00
dfcca19d95 Vendor swarmkit 46bbd41
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 99119fcafa41fb8c95e67b225a3da2902ce0e959
Component: engine
2017-02-27 11:51:00 -08:00
8c590c8511 Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
This fix updates SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
(from 037b4913929019d44bc927870bf2d92ce9ca261f)

The following issues in docker are related
- Can not update service in host publish mode (#30199) (fixed)
- Add `ReadonlyRootfs` in ContainerSpec for `--read-only` (#29972) (needed)
- Explicitly disallow network pluginv1 creation in swarm mode
  (See discussion in docker/swarmkit/pull/1899, docker/swarmkit/pull/1894,
  and docker/docker/pull/30332#issuecomment-274277948)

This fix fixes #30199

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 849816dd0fbd70d0e46567fffc7416b667bff9b5
Component: engine
2017-01-29 08:11:26 -08:00
d93ce12d04 Vendor swarmkit, containerd, and related dependencies
Update swarmkit to 037b491.

As swarmkit switched to a newer gRPC version, this also involves
updating Docker's vendored gRPC, which in turn requires updating
containerd to a new version that has protobufs generated against this
gRPC version.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 3e987e1732ee5c51e95934afabba3fedfd16c4af
Component: engine
2017-01-23 17:51:14 -08:00
b4573da32a Vendor swarmkit
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: eb13865d4e43d3084b017bf2b1287cff5e060b77
Component: engine
2017-01-19 17:20:33 -08:00
cc8a539fed Update vendored swarmkit to 62d835f
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: f31ed6cb5bb0888acd83c5ddcd3c0da95dc0719b
Component: engine
2017-01-10 13:00:11 -08:00
5bf9b5443d Update swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857
This commit updates swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f3a274fa08d70e25b31ba0e0603d14d3b9997c32
Component: engine
2017-01-10 03:46:42 -08:00
5932f8db18 vendor: update dependencies for go-digest
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 083ad52f607e83b41e508827c8d502448f606a09
Component: engine
2017-01-06 18:48:52 -08:00
5b11368767 Revendor swarmkit to 2e956c4
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: b1f5320dd6812a34cb4684419f509d17798985b7
Component: engine
2017-01-05 14:55:52 -08:00
f6ae1b2ad9 Vendor swarmkit
Update swarmkit to deec7ba2c4ef48f20ebe9674afbcced606a5339e, from the master branch.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 7375507eeae61cfb5e93f074235320687595b07d
Component: engine
2016-12-05 04:56:40 +00:00
a8959c0a37 revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 51247185a2c53854163276404a3438c9eb38c3b5
Component: engine
2016-11-22 17:01:02 -08:00
b72665f309 Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: e35c1747f5ebd36ba9d35ded5613e4e4762645d4
Component: engine
2016-11-18 13:32:26 -08:00
01fd03f430 Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: fbe87907597dcea5a5ac493689556873b16a809f
Component: engine
2016-11-16 18:15:15 -08:00
1e77cc5379 vendor: update swarmkit to bddd3f0
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2a68f0f0016caa6cef8d32726002b9ad02a4c56c
Component: engine
2016-11-09 16:08:52 -08:00
fc88fcd016 Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 014eeb539beaf84c69dc2a97b8ffd32551219d0e
Component: engine
2016-11-04 12:26:37 -07:00
61646d77af project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f2614f2107c838d014d31b806e3b8a9f1395cb2b
Component: engine
2016-11-03 15:31:46 -07:00