Commit Graph

49 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
b6052669e6 vendor: swarmkit master (after libnetwork move)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-08 22:47:33 +02:00
Brian Goff
7abc3e83c9 Use tmp swarmkit fork for libnetwork import
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-06-01 21:51:37 +00:00
Drew Erny
30d9fe30b1 Add swarm jobs
Adds support for ReplicatedJob and GlobalJob service modes. These modes
allow running service which execute tasks that exit upon success,
instead of daemon-type tasks.

Signed-off-by: Drew Erny <drew.erny@docker.com>
2020-01-13 13:21:12 -06:00
Drew Erny
07efe6a0a7 Bump swarmkit to 24fb4cfe8af56803640180c5592bf32da732ced2
Bumps the vendoring of github.com/docker/swarmkit to the above commit,
which is the current master at commit time.

Most notably, this includes a change making the ingress network respect
the default address pool. Because of this change, a change to network
integration tests was needed.

Signed-off-by: Drew Erny <drew.erny@docker.com>
2020-01-07 09:43:22 -06:00
Drew Erny
67e25ec5ac Bump swarmkit vendoring
Includes the following changes since last vendoring:

docker/swarmkit#2795 - Add capabilities list to container specification
docker/swarmkit#2845 - Fix linting error
docker/swarmkit#2848 - Bump fernet/fernet-go
docker/swarmkit#2856 - Add ListServiceStatuses grpc method
docker/swarmkit#2857 - Use Service Placement Constraints in Enforcer

Signed-off-by: Drew Erny <drew.erny@docker.com>
2019-05-24 12:07:38 -05:00
Sebastiaan van Stijn
a356c4eaee bump swarmkit 18e7e58ea1a5ec016625a636d0d52500eea123bc
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-26 14:57:19 +01:00
Sebastiaan van Stijn
667e800b2c bump swarmkit to 415dc72789e2b733ea884f09188c286ca187d8ec
relevant changes:

- swarmkit#2815 Extension and resource API declarations
- swarmkit#2816 Moving swap options into `ResourceRequirements` instead of `ContainerSpec`s
  - relates to moby#37872
- swarmkit#2821 allocator: use a map for network-IDs to prevent O(n2)
- swarmkit#2832 [api] Add created object to return types for extension and resource create apis
- swarmkit#2831 [controlapi] Extension api implementation
- swarmkit#2835 Resource controlapi Implemetation
- swarmkit#2802 Use custom gRPC dialer to override default proxy dialer
  - addresses moby#35395 Swarm worker cannot connect to master if proxy is configured
  - addresses moby#issues/36951 Swarm nodes cannot join as masters if http proxy is set
  - relates to swarmkit#2419 Provide custom gRPC dialer to override default proxy dialer

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-06 16:46:01 +01:00
Sebastiaan van Stijn
0e60e48134 Bump swarmkit to 1a0ebd43b2d156983a695f90e56f4ecba6ced902
Full diff: 8af8c420f4...1a0ebd43b2

relevant changes:

- swarmkit#2771 Allow using Configs as CredentialSpecs
- swarmkit#2804 Make Service.UpdateStatus non-ambiguous
- swarmkit#2805 Refactor condition in restart supervisor
- swarmkit#2780 api: add BindOptions.NonRecursive
  - related to moby#38003
- swarmkit#2790 Fix possible panic if NetworkConfig is nil
- swarmkit#2797 Include old error-message for backward compatibility
  - related to swarmkit#2779 / moby#38140 / moby#38142

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-01 01:35:12 +01:00
selansen
a7ce3140f5 Vendor commit for VXLAN UDP Port configuration support
This commit brings Swarmkit and Libnetwork library changes
Signed-off-by: selansen <elango.siva@docker.com>
2018-11-22 12:44:44 -05:00
Sebastiaan van Stijn
8dedcb8c51 Bump swarmkit to 7d5d33b97794440462a04acdd3f31914da8f66f3
Relevant changes;

- swarmkit#2681 Handle an edge case in CA rotation where we reclaim CA service from an external CA
- swarmkit#2750 Use gometalinter; switch from x/net/context -> context

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-11 23:03:18 +02:00
selansen
148ff00a0a Global Default AddressPool - Update
Addressing few review comments as part of code refactoring.
Also moved validation logic from CLI to Moby.

Signed-off-by: selansen <elango.siva@docker.com>
2018-09-11 19:02:54 -04:00
selansen
f7ad95cab9 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>
2018-08-20 15:07:08 -04:00
Derek McGowan
52ed3e0896 Update containerd to 1.1
Updates swarmkit, grpc, and all related vendors

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-04 15:37:03 -07:00
Sebastiaan van Stijn
27749659d5 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>
2018-04-02 15:17:38 -07:00
Sebastiaan van Stijn
191324b8f1 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>
2018-02-09 18:39:49 -08:00
Anshul Pundir
9fdbb32fce Swarmkit vendoring.
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
2017-12-05 14:27:49 -08:00
Renaud Gaubert
b3960fc1c4 Revendored swarmkit
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-03 15:43:50 +01:00
Pradip Dhara
8e15b1cffb vndr swarmkit 941a01844b89c56aa61086fecb167ab3af1de22b
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2017-09-26 22:08:10 +00:00
Liron Levin
3b8d36d064 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>
2017-08-18 21:52:26 +03:00
Derek McGowan
4f3616fb1c 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>
2017-07-31 13:19:38 -07:00
Liron Levin
7d45cafd57 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>
2017-07-15 16:50:02 +03:00
Ying Li
4509a001df Re-vendor swarmkit. This includes the following fixes:
- https://github.com/docker/swarmkit/pull/2266 (support for templating Node.Hostname in docker executor)
- https://github.com/docker/swarmkit/pull/2281 (change restore action on objects to be update, not delete/create)
- https://github.com/docker/swarmkit/pull/2285 (extend watch queue with timeout and size limit)
- https://github.com/docker/swarmkit/pull/2253 (version-aware failure tracking in the scheduler)
- https://github.com/docker/swarmkit/pull/2275 (update containerd and port executor to container client library)
- https://github.com/docker/swarmkit/pull/2292 (rename some generic resources)
- https://github.com/docker/swarmkit/pull/2300 (limit the size of the external CA response)
- https://github.com/docker/swarmkit/pull/2301 (delete global tasks when the node running them is deleted)

Minor cleanups, dependency bumps, and vendoring:
- https://github.com/docker/swarmkit/pull/2271
- https://github.com/docker/swarmkit/pull/2279
- https://github.com/docker/swarmkit/pull/2283
- https://github.com/docker/swarmkit/pull/2282
- https://github.com/docker/swarmkit/pull/2274
- https://github.com/docker/swarmkit/pull/2296 (dependency bump of etcd, go-winio)

Signed-off-by: Ying Li <ying.li@docker.com>
2017-07-11 13:43:43 -07:00
Aaron Lehmann
79b940feee Vendor swarmkit 79381d0
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-21 15:32:53 -07:00
Aaron Lehmann
32d7b0f360 Vendor swarmkit a4bf013
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-12 10:31:11 -07:00
Alessandro Boch
8daeeacfc1 Vendor swarmkit @998a47f
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-05-17 15:50:28 -07:00
Aaron Lehmann
721b7a7fad Vendor swarmkit ae29cf2
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-12 17:36:11 -07:00
Aaron Lehmann
077f08bf54 Vendor swarmkit 8f053c2
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-02 15:51:26 -07:00
Ying Li
e34bee387e 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>
2017-04-12 16:55:47 -07:00
Andrea Luzzardi
367b57d985 Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2017-04-05 18:49:23 -07:00
Alessandro Boch
747f0b4ba5 Vendoring swarmkit @b74ec2b
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-30 16:12:33 -07:00
Dong Chen
aac861f3d9 vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2017-03-28 11:51:33 -07:00
Alessandro Boch
434e9695e4 Vendoring swarmkit @9fdea50
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-24 11:07:33 -07:00
Aaron Lehmann
79bf23845b Vendor swarmkit 0e2d9eb
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-10 11:15:44 -08:00
Aaron Lehmann
39433318fe Vendor swarmkit d60ccf3
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-07 19:09:21 -08:00
Aaron Lehmann
99119fcafa Vendor swarmkit 46bbd41
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-02-27 11:51:00 -08:00
Yong Tang
ec860ca252 Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
This fix tries to update the SwarmKit from
ed384f3b3957f65e3111bd020f9815f3d4296fa2
to
6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0

The following is the list of docker related changes:
1. Took long time for Docker Swarm service turn desired state from Ready to Running (Issue #28291)
2. Native Swarm in 1.12 - panic: runtime error: index out of range (Issue #25608)
3. Global mode target replicas keep increasing (Issue #30854)
4. Creating service with publish mode=host and without published port crashes swarm manager (Issue #30938)
5. Define signals used to stop containers for updates (Issue #25696) (PR #30754)

This fix fixes #28291, #25608, #30854, #30938.
This fix is required by PR #30754.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-16 08:50:00 -08:00
Derek McGowan
2bea87393b Update swarmkit vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2017-02-07 11:08:36 -08:00
Yong Tang
849816dd0f 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>
2017-01-29 08:11:26 -08:00
Aaron Lehmann
3e987e1732 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>
2017-01-23 17:51:14 -08:00
Anusha Ragunathan
eb13865d4e Vendor swarmkit
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-01-19 17:20:33 -08:00
Stephen J Day
083ad52f60 vendor: update dependencies for go-digest
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-01-06 18:48:52 -08:00
Aaron Lehmann
4441e390d0 Update vendored swarmkit to 5fe1f720
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-07 18:06:28 -08:00
Akihiro Suda
7375507eea Vendor swarmkit
Update swarmkit to deec7ba2c4ef48f20ebe9674afbcced606a5339e, from the master branch.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-05 04:56:40 +00:00
Andrea Luzzardi
51247185a2 revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-22 17:01:02 -08:00
Andrea Luzzardi
fbe8790759 Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-16 18:15:15 -08:00
Tonis Tiigi
2a68f0f001 vendor: update swarmkit to bddd3f0
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-09 16:08:52 -08:00
Vincent Demeester
6212ea669b Add support for swarm mode templating
Wire templating support of swarmkit for the engine, in order to be used
through services.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-09 23:28:06 +01:00
Andrea Luzzardi
014eeb539b Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-04 12:26:37 -07:00
Alexander Morozov
f2614f2107 project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-11-03 15:31:46 -07:00