Skip to content

Commit 33d5e1d

Browse files
authored
Merge pull request #60 from ijc/put-back-mounts
Revert "Drop duplicate mounts of CNI directories."
2 parents c723c00 + 24c48df commit 33d5e1d

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

pkg/kubelet/build.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,12 @@ config:
3636
- /var/lib/cni/bin
3737
- /var/lib/kubelet-plugins
3838
- /var/lib/nfs/statd/sm
39+
mounts:
40+
- type: bind
41+
source: /var/lib/cni/bin
42+
destination: /opt/cni/bin
43+
options: ["rw","bind"]
44+
- type: bind
45+
source: /var/lib/cni/conf
46+
destination: /etc/cni/net.d
47+
options: ["rw","bind"]

yml/kube.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040
image: linuxkit/sshd:4f403fe5ae53dc3e45c8f6972dced9dddf900ae6
4141
cgroupsPath: systemreserved/sshd
4242
- name: kubelet
43-
image: linuxkit/kubelet:0513947feba7c6cdf5d8d815fb776a99011307ff
43+
image: linuxkit/kubelet:1b3b31281092aef89c39107aeed90299aeaa19a7
4444
cgroupsPath: podruntime/kubelet
4545
files:
4646
- path: etc/linuxkit.yml

0 commit comments

Comments
 (0)