Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[23.0 backport] vendor: github.com/moby/swarmkit/v2 v2.0.0-20230302163403-80a528a86877 #45107

Merged
merged 1 commit into from Mar 9, 2023

Conversation

thaJeztah
Copy link
Member

full diff: moby/swarmkit@904c221...80a528a

(cherry picked from commit 1a1f5b3)

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah thaJeztah added this to the 23.0.2 milestone Mar 6, 2023
- fix docker service create doesn't work when network and generic-resource are both attached
- Fix removing tasks when a jobs service is removed
- CSI: Allow NodePublishVolume even when plugin does not support staging

full diff: moby/swarmkit@904c221...80a528a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 088aff1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 23.0_backport_bump_swarmkit branch from 8162af9 to 3bd2fc8 Compare March 7, 2023 11:10
@thaJeztah
Copy link
Member Author

re-did the cherry-pick as the commit in master changed; minor conflict (vendor.sum) due to dependencies in master diverging after buildkit was updated there

@thaJeztah
Copy link
Member Author

Hitting this flaky again on Windows 2022;

=== FAIL: github.com/docker/docker/integration-cli TestDockerCLIRunSuite/TestRunContainerWithRmFlagCannotStartContainer (12.76s)
    docker_cli_run_test.go:2773: timeout hit after 10s: waiting for container 'sparkles' to be removed
    --- FAIL: TestDockerCLIRunSuite/TestRunContainerWithRmFlagCannotStartContainer (12.76s)

@thaJeztah thaJeztah merged commit 6cb40fe into moby:23.0 Mar 9, 2023
@thaJeztah thaJeztah deleted the 23.0_backport_bump_swarmkit branch March 9, 2023 22:18
mmenozzi added a commit to webgriffe/swarm-cron that referenced this pull request Mar 21, 2023
Hoping that when the PR moby/moby#45107
will be realeased we don't get infinite orphaned tasks on the swarm.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants