Cherry pick docker #30145 and vendor corresponding swarmkit #1883#30332
Cherry pick docker #30145 and vendor corresponding swarmkit #1883#30332vieux merged 3 commits intomoby:1.13.xfrom
Conversation
This is necessary for swarmkit to support cluster wide plugins, such as globally scoped network plugins. Signed-off-by: Anusha Ragunathan <[email protected]>
|
LGTM |
1 similar comment
|
LGTM |
|
@anusha-ragunathan IT failures on plugin-v1 never cease to amaze me :-( Having said that, the test is infact correct and we must try and fail the plugin-v1 case since we are not supporting plugin-v1 with swarmkit (due to the constraints). With the new addition to support plugin-v2 in swarmkit, the |
|
@anusha-ragunathan you can revert c8083e8 to get your PR moving. We can address the plugin-v1 graceful failure independently. |
|
@anusha-ragunathan i agree. can you pls push the PR in swarmkit ? |
anusha-ragunathan
force-pushed
the
1.13.x
branch
from
b13000a to
8dfde2f
Compare
|
Waiting on moby/swarmkit#1899 to be merged. After that, a corresponding swarmkit 1.13.x PR will be made and that will be vendored into docker/docker as part of this PR. |
Signed-off-by: Anusha Ragunathan <[email protected]>
Signed-off-by: Anusha Ragunathan <[email protected]>
anusha-ragunathan
force-pushed
the
1.13.x
branch
from
54995e5 to
f0f020a
Compare
|
Thanks @anusha-ragunathan for addressing the v1 issue cleanly. LGTM (again) |
|
LGTM (again) |
|
Do we have to merge this back to master as well, or will there be a separate PR @anusha-ragunathan ? |
|
oh, nevermind, this was a cherry pick of #30145 😊 : |
This fix updates SwarmKit to 78ae345 (from 037b491) The following issues in docker are related - Can not update service in host publish mode (moby#30199) (fixed) - Add `ReadonlyRootfs` in ContainerSpec for `--read-only` (moby#29972) (needed) - Explicitly disallow network pluginv1 creation in swarm mode (See discussion in moby/swarmkit/pull/1899, moby/swarmkit/pull/1894, and moby/pull/30332#issuecomment-274277948) This fix fixes moby#30199 Signed-off-by: Yong Tang <[email protected]>
This commit updates TestSwarmNetworkPlugin, similiar to changes in moby#30332 Signed-off-by: Yong Tang <[email protected]>
6 participants
Verified that in swarmmode, plugin install (docker plugin install bboreham/weave2) and network creation (docker network create --driver=bboreham/weave2 foo works) using the plugin works.