Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.03] update swarmkit #521

Closed

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Apr 19, 2018

Bump SwamKit to latest version (full diff: moby/swarmkit@11d7b06...9c2aa15)

cherry-picks of:

git checkout -b 18.03-update-swarmkit upstream/18.03

# revert engine-side of https://github.com/docker/docker-ce/pull/453
git revert -s -S 2d690d4e875eeff919c03bab41a410e9c56a216f

# https://github.com/moby/moby/pull/36701
git cherry-pick -s -S -x -Xsubtree=components/engine 27749659d5a30999691e401a351221780a483099

# https://github.com/moby/moby/pull/36880
git cherry-pick -s -S -x -Xsubtree=components/engine 333b2f28fef4ba857905e7263e7b9bbbf7c522fc

git push -u origin 18.03-update-swarmkit

no conflicts

…4301"

This reverts commit 2d690d4.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
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 moby/swarmkit#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 <[email protected]>
(cherry picked from commit 27749659d5a30999691e401a351221780a483099)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Relevant changes:

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

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 333b2f28fef4ba857905e7263e7b9bbbf7c522fc)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 18.03.1 milestone Apr 19, 2018
@andrewhsu andrewhsu modified the milestones: 18.03.1, 18.03.2 May 14, 2018
@thaJeztah
Copy link
Member Author

moby/swarmkit#2574 (included in this bump) is being reverted in
moby/swarmkit#2710, because it introduced a regression (moby/swarmkit#2705)

@andrewhsu
Copy link
Contributor

Closing this PR because docker-ce 18.03 is EOL.

@andrewhsu andrewhsu closed this Aug 28, 2018
@thaJeztah thaJeztah deleted the 18.03-update-swarmkit branch August 28, 2018 10:16
docker-jenkins pushed a commit that referenced this pull request Feb 23, 2021
deb: add support for building debian 11 "Bullseye"
Upstream-commit: 7889cc4
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
deb: add support for building debian 11 "Bullseye"
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants