Conversation
|
Looks like the following failure happens on all platform: |
4b3625a to
8f7ac41
Compare
|
Please sign your commits following these rules: $ git clone -b "swarmkit-revendored" [email protected]:RenaudWasTaken/moby.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354008608
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -fAmending updates the existing PR. You DO NOT need to open a new one. |
|
After some work I found that the root cause of this bug was introduced by moby/swarmkit#2287 The error message is now surfaced in the Error field. I've added a commit to fix this, |
8f7ac41 to
f091918
Compare
f091918 to
094102c
Compare
daemon/config/config.go
Outdated
There was a problem hiding this comment.
Do we have a test to test loading this configuration from a daemon.json configuration file?
There was a problem hiding this comment.
Just added one :)
990a354 to
6828193
Compare
anshulpundir
left a comment
There was a problem hiding this comment.
Should we also include moby/swarmkit@312be59? @thaJeztah
|
Thanks @thaJeztah for the list! Can you point me to the mentioned PR revendoring swarmkit ? |
|
@anshulpundir ah! yes, missed that one in my overview; I updated the list, and updated the list at the top as well @RenaudWasTaken #34424 was merged, so this PR now needs a rebase 😅; probably just amending the first commit ("Revendored swarmkit "), and running |
Signed-off-by: Renaud Gaubert <[email protected]>
6828193 to
216abca
Compare
|
@thaJeztah Looks like it also fixed the integration test: https://github.com/moby/moby/pull/34424/files#diff-eb3f7d0d8dfa41106bb74d7e5dfe43ecR203 I've removed that commit. |
|
@thaJeztah is this PR good to go ? |
thaJeztah
left a comment
There was a problem hiding this comment.
Thanks! Just some minor nits, but looks good otherwise
cmd/dockerd/config.go
Outdated
There was a problem hiding this comment.
nit: can you change user defined to user-defined here?
opts/opts.go
Outdated
There was a problem hiding this comment.
This message looks incomplete ("argument of the for .. ")?
Looking at other messages, I think we use invalid ... for other similar messages (e.g.
moby/daemon/cluster/convert/container.go
Line 296 in d91c5f4
Perhaps something like:
invalid node-generic-resource format: expected 'name=value':
@MistyHacks perhaps you have a better suggestion?
There was a problem hiding this comment.
I think it's ok, if you also include a got portion to the error message. What is a "node-generic-resource"?
There was a problem hiding this comment.
@MistyHacks the full design document is here.
The basic idea is that it's a way for a node to advertise user-defined resources
Signed-off-by: Renaud Gaubert <[email protected]>
Signed-off-by: Renaud Gaubert <[email protected]>
216abca to
734346a
Compare
|
Thanks @RenaudWasTaken - I think this needs an update to the documentation (as the format for the |
|
@thaJeztah will be doing this as part of docker/cli/pull/429 |
|
Perfect, thanks @RenaudWasTaken |
|
Looks like I'll have to revendor ~100 commits of docker/docker though :( |
|
If you prefer, I can do a separate bump for all changes before yours |
|
@thaJeztah It would make things a lot easier :) Thanks! On the other hand it does look like I'll still have to revendor docker because of the way parsing is done. Basically parsing in the daemon is through swarmkit/api/genericresource.Parse and then docker/daemon/cluster/convert.GenericResourcesFromGRPC Meaning that if I want to do the same in the CLI I'll need to add a lot of new dependencies. Because that'll mean vendoring docker/daemon/cluster/convert which has a lot of dependencies. Should I copy swarmkit/api/genericresource.Parse in docker/cli or add the 10+ dependencies to the vendor.conf ? |
|
The dependencies of I would duplicate |
includes moby/swarmkit#2419, which:
fixes #34825
fixes #34996
fixes #35046
fixes #35395
Hello!
- What I did
- Description for the changelog
Revendored Swarmkit
@anshulpundir can you confirm that the revendoring does not require me to change moby/moby ?
Ping @thaJeztah
- Bumps
moby/swarmkit@28f91d8...de950a7
- A picture of a cute animal (not mandatory but encouraged)
