Revert "Drop duplicate mounts of CNI directories." #60
Conversation
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
This reverts commit 81e8953. These mounts are apparently not as redundant as they first seemed. The `runtimes.mounts` paths are all wrt the host mount namespace, so these are in fact binding the (writeable) `/var/lib/cni` paths over the (readonly) canonical host CNI paths. The `binds` will then bind those host paths into the kubelet container. Fixes linuxkit#59, I also saw this during development of linuxkit#58. Signed-off-by: Ian Campbell <ijc@docker.com>
|
The bug was introduced by me in #57. |
rn
approved these changes
Feb 12, 2018
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.
This reverts commit 81e8953.
These mounts are apparently not as redundant as they first seemed. The
runtimes.mountspaths are all wrt the host mount namespace, so these are infact binding the (writeable)
/var/lib/cnipaths over the (readonly) canonicalhost CNI paths. The
bindswill then bind those host paths into the kubeletcontainer.
Fixes #59, I also saw this during development of #58.
Signed-off-by: Ian Campbell ijc@docker.com