Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly disallow network pluginv1 creation in swarm mode. #1899

Merged
merged 1 commit into from Jan 25, 2017

Conversation

anusha-ragunathan
Copy link
Contributor

In swarm mode, only network pluginv2 is supported; pluginv1 is not.
When the plugin support was re-enabled, it inadvertently allowed
both pluginv1 and pluginv2. This commit fixes that.

Signed-off-by: Anusha Ragunathan anusha.ragunathan@docker.com

In swarm mode, only network pluginv2 is supported; pluginv1 is not.
When the plugin support was re-enabled, it inadvertently allowed
both pluginv1 and pluginv2. This commit fixes that.

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
@anusha-ragunathan
Copy link
Contributor Author

@mavenugo
Copy link
Contributor

mavenugo commented Jan 25, 2017

Adding reference to #1894 to capture all the discussions and reasoning that went behind this change.

@anusha-ragunathan thanks for the additional change to check for the builtIn drivers. The better fix would be to check for the newly introduced libnetwork's IsBuiltIn() API. It requires a libnetwork vendoring. But, that can be done as part of my upcoming changes to support local-scoped networks in swarmkit.

LGTM

@aaronlehmann
Copy link
Collaborator

LGTM

1 similar comment
@vieux
Copy link
Contributor

vieux commented Jan 25, 2017

LGTM

@tonistiigi tonistiigi merged commit f47126c into moby:master Jan 25, 2017
@aaronlehmann aaronlehmann added this to the 1.13.0 milestone Jan 25, 2017
@anusha-ragunathan anusha-ragunathan deleted the disallow_net_pv1 branch January 25, 2017 23:56
yongtang added a commit to yongtang/docker that referenced this pull request Jan 29, 2017
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 <yong.tang.github@outlook.com>
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.

None yet

5 participants