Skip to content

Revert "Drop duplicate mounts of CNI directories." #60

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 12, 2018
Merged

Revert "Drop duplicate mounts of CNI directories." #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkg/kubelet/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,12 @@ config:
- /var/lib/cni/bin
- /var/lib/kubelet-plugins
- /var/lib/nfs/statd/sm
mounts:
- type: bind
source: /var/lib/cni/bin
destination: /opt/cni/bin
options: ["rw","bind"]
- type: bind
source: /var/lib/cni/conf
destination: /etc/cni/net.d
options: ["rw","bind"]
2 changes: 1 addition & 1 deletion yml/kube.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ services:
image: linuxkit/sshd:4f403fe5ae53dc3e45c8f6972dced9dddf900ae6
cgroupsPath: systemreserved/sshd
- name: kubelet
image: linuxkit/kubelet:0513947feba7c6cdf5d8d815fb776a99011307ff
image: linuxkit/kubelet:1b3b31281092aef89c39107aeed90299aeaa19a7
cgroupsPath: podruntime/kubelet
files:
- path: etc/linuxkit.yml
Expand Down