Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@corhere
Copy link
Contributor

@corhere corhere commented Jun 13, 2025

- What I did

- How I did it

- How to verify it

- Human readable description for the release notes

- Fix an issue where all new tasks in the Swarm could get stuck in the PENDING state forever after scaling up a service with placement preferences.

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

@corhere corhere added this to the 25.0.11 milestone Jun 13, 2025
@corhere corhere requested a review from thaJeztah June 13, 2025 22:18
@corhere corhere force-pushed the backport-25.0/cycle-free-swarmkit branch from 71e1b63 to e12f8b9 Compare June 16, 2025 21:51
@corhere corhere changed the title [25.0] vendor: github.com/moby/swarmkit/v2 v2.0.0-20250613170222-a45be3cac15c [25.0] vendor: github.com/moby/swarmkit/v2 v2.0.0 Jun 16, 2025
corhere added 4 commits June 16, 2025 18:49
Moby imports Swarmkit; Swarmkit no longer imports Moby. In order to
accomplish this feat, Swarmkit has introduced a new plugin.Getter
interface so it could stop importing our pkg/plugingetter package. This
new interface is not entirely compatible with our
plugingetter.PluginGetter interface, necessitating a thin adapter.

Swarmkit had to jettison the CNM network allocator to stop having to
import libnetwork as the cnmallocator package is deeply tied to
libnetwork. Move the CNM network allocator into libnetwork, where it
belongs. The package had a short an uninteresting Git history in the
Swarmkit repository so no effort was made to retain history.

Signed-off-by: Cory Snider <[email protected]>
(cherry-picked from commit 7b0ab10)

d/cluster/convert: expose Addr() on plugins

The swarmPlugin type does not implement the Swarm plugin.AddrPlugin
interface because it embeds an interface value which does not include
that method in its method set. (You can type-assert an interface value
to another interface which the concrete type implements, but a struct
embedding an interface value is not itself an interface value.) Wrap the
plugin with a different adapter type which exposes the Addr() method if
the concrete plugin implements it.

Signed-off-by: Cory Snider <[email protected]>
(cherry picked from commit 8b6d6b9)

libnetwork/cnmallocator: fix non-constant format string in call (govet)

    libnetwork/cnmallocator/drivers_ipam.go:43:31: printf: non-constant format string in call to (*github.com/docker/docker/vendor/github.com/sirupsen/logrus.Entry).Infof (govet)
            log.G(context.TODO()).Infof("Swarm initialized global default address pool to: " + str.String())
                                        ^

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 7b60a70)

Signed-off-by: Cory Snider <[email protected]>
Apply command gotest.tools/v3/assert/cmd/gty-migrate-from-testify to the
cnmallocator package to be consistent with the assertion library used
elsewhere in moby.

Signed-off-by: Cory Snider <[email protected]>
(cherry-picked from commit 4f30a93)
Signed-off-by: Cory Snider <[email protected]>
While github.com/stretchr/testify is not used directly by any of the
repository code, it is a transitive dependency via Swarmkit and
therefore still easy to use without having to revendor. Add lint rules
to ban importing testify packages to make sure nobody does.

Signed-off-by: Cory Snider <[email protected]>
(cherry picked from commit 7ebd88d)
Signed-off-by: Cory Snider <[email protected]>
- add Unwrap errror to custom error types
- removes dependency on github.com/rexray/gocsi
- fix CSI plugin load issue
- add ALPN next protos configuration to gRPC server
- fix task scheduler infinite loop

full diff: moby/swarmkit@911c976...v2.0.0

Signed-off-by: Cory Snider <[email protected]>
@corhere corhere force-pushed the backport-25.0/cycle-free-swarmkit branch from e12f8b9 to 4d16861 Compare June 16, 2025 22:50
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah merged commit 95aff4f into moby:25.0 Jun 17, 2025
130 checks passed
@corhere corhere deleted the backport-25.0/cycle-free-swarmkit branch June 17, 2025 15:55
@corhere corhere modified the milestones: 25.0.11, 25.0.12 Jun 18, 2025
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.

2 participants