Move swarmd into its own Go module #3170
Merged
Conversation
This file contains 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
Signed-off-by: Cory Snider <csnider@mirantis.com>
The Docker API executor is one of the only importers of github.com/docker/docker and is only used by swarmd. Move it under the swarmd package tree in preparation for turning swarmd into its own Go module. Signed-off-by: Cory Snider <csnider@mirantis.com>
|
Did not know you could do something like this, but it wraps things up neatly. |
|
Makefile should still build |
Signed-off-by: Cory Snider <csnider@mirantis.com>
corhere
force-pushed
the
swarmd-module
branch
from
00e1230
to
1b63b0b
Compare
|
I've updated the |
Make sure that swarmd does not bit-rot by building and testing it against the local swarmkit module sources instead of whichever version is listed in go.mod. This does risk us failing to notice when bumping the swarmkit requirement becomes necessary, but we do not expect any third parties to import packages from the swarmd module. And if anyone does, they could always work around our oversight by adding a requirement on a newer Swarmkit to their project. Signed-off-by: Cory Snider <csnider@mirantis.com>
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #3170 +/- ##
==========================================
- Coverage 61.75% 57.42% -4.33%
==========================================
Files 155 149 -6
Lines 31143 31330 +187
==========================================
- Hits 19232 17991 -1241
- Misses 10371 11937 +1566
+ Partials 1540 1402 -138 |
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.
The dockerapi executor has a dependency on the Docker API client, making it one of the primary reasons why Swarmkit depends on github.com/docker/docker. But it is only used by swarmd. Move the swarmd commands and the dockerapi executor into a separate Go module to help break the dependency cycle between github.com/docker/docker and github.com/moby/swarmkit/v2.
- What I did
Moved the swarmd commands (cmd/swarmd, cmd/swarmctl, cmd/swarm-rafttool, cmd/external-ca-example) and agent/exec/dockerapi into a dedicated subtree and made that subtree into its own Go module.
- How I did it
Very tediously.
- How to test it
- Description for the changelog