[18.03] update swarmkit

[thaJeztah]

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

cherry-picks of:

• revert [18.03] disallow attaching ingress network #453 (superseded by cherry-picks below)

• Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff moby/moby#36701 Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff

  Full diff: moby/swarmkit@11d7b06...831df67

  Changes included:

  • [manager/state] Add fernet as an option for raft encryption moby/swarmkit#2535 [manager/state] Add fernet as an option for raft encryption
  • Log GRPC server errors moby/swarmkit#2541 Log GRPC server errors
  • Log leadership changes at manager level moby/swarmkit#2542 Log leadership changes at manager level
  • [state/raft] Increase raft ElectionTick to 10xHeartbeatTick moby/swarmkit#2564 [state/raft] Increase raft ElectionTick to 10xHeartbeatTick
  • Remove the containerd executor moby/swarmkit#2568 Remove the containerd executor
  • agent: backoff session when no remotes are available moby/swarmkit#2570 agent: backoff session when no remotes are available
    • addresses Backoff time not honored by error message causes system log flood moby/moby#36683
  • [ca/manager] Remove root CA key encryption support entirely moby/swarmkit#2573 [ca/manager] Remove root CA key encryption support entirely
  • Fix agent logging race moby/swarmkit#2578 Fix agent logging race (fixes Data race in agent logging moby/swarmkit#2576)
  • Adding logic to restore networks in order moby/swarmkit#2571 Adding logic to restore networks in order
    • Addresses network restore in leader change scenarios.

• Bump SwarmKit to 9c2aa152c3054371b833483a7ddad8d15052ec4f moby/moby#36880 Bump SwarmKit to 9c2aa152c3054371b833483a7ddad8d15052ec4f

  Full diff: moby/swarmkit@831df67...9c2aa15

  Relevant changes:

  • RoleManager will remove deleted nodes from the cluster membership moby/swarmkit#2551 RoleManager will remove deleted nodes from the cluster membership
    • Fixes Role reconciler needs to look at all the nodes present and not present on startup moby/swarmkit#2548
    • Addresses Ghost manager present in swarm, unable to remove it using docker node rm moby/moby#36851
  • Scheduler/TaskReaper: handle unassigned tasks marked for shutdown moby/swarmkit#2574 Scheduler/TaskReaper: handle unassigned tasks marked for shutdown
    • Addresses Pending task never goes away moby/moby#36699
  • Avoid predefined error log moby/swarmkit#2561 Avoid predefined error log
  • Task reaper should delete tasks with removed slots that were not yet assigned moby/swarmkit#2557 Task reaper should delete tasks with removed slots that were not yet assigned
    • Addresses Task reaper does not consider some tasks for removal moby/swarmkit#2555
  • [fips] Agent reports FIPS status moby/swarmkit#2587 [fips] Agent reports FIPS status
  • Fix manager/state/store.timedMutex moby/swarmkit#2603 Fix manager/state/store.timedMutex
    • Fixes manager/state/store.timedMutex bug moby/swarmkit#2602

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

[thaJeztah]

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

[andrewhsu]

Closing this PR because docker-ce 18.03 is EOL.