[25.0] vendor: github.com/moby/swarmkit/v2 v2.0.0#50203
Merged
Conversation
71e1b63 to
e12f8b9
Compare
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 <csnider@mirantis.com> (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 <csnider@mirantis.com> (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 <github@gone.nl> (cherry picked from commit 7b60a70) Signed-off-by: Cory Snider <csnider@mirantis.com>
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 <csnider@mirantis.com> (cherry-picked from commit 4f30a93) Signed-off-by: Cory Snider <csnider@mirantis.com>
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 <csnider@mirantis.com> (cherry picked from commit 7ebd88d) Signed-off-by: Cory Snider <csnider@mirantis.com>
- 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 <csnider@mirantis.com>
e12f8b9 to
4d16861
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
- 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)