Skip to content

Commit 73b5309

Browse files
authored
Merge pull request #84 from ijc/nomore-rootprop-workaround
Revert "Workaround `rootfsPropagation: shared` brokenness."
2 parents 6e59d75 + c4311bf commit 73b5309

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

pkg/cri-containerd/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,5 @@ RUN make DESTDIR=/out install
4848

4949
FROM scratch
5050
WORKDIR /
51-
# `rootfsPropagation: shared` (used in `build.yml`) appears to be broken at the moment, workaround that issue here.
52-
#ENTRYPOINT ["cri-containerd", "--log-level", "info", "--network-bin-dir", "/opt/cni/bin", "--network-conf-dir", "/etc/cni/net.d"]
53-
ENTRYPOINT ["/bin/sh", "-c", "set -ex; mount --make-shared / && exec cri-containerd --log-level info --network-bin-dir /opt/cni/bin --network-conf-dir /etc/cni/net.d"]
51+
ENTRYPOINT ["cri-containerd", "--log-level", "info", "--network-bin-dir", "/opt/cni/bin", "--network-conf-dir", "/etc/cni/net.d"]
5452
COPY --from=build /out /

yml/cri-containerd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
- name: cri-containerd
3-
image: linuxkit/cri-containerd:093735eea5b3d7488ffc5a0ecf83a08e344f2e4f
3+
image: linuxkit/cri-containerd:74cb328b786d5cada9ddfca0097675b51c7e7d93
44
cgroupsPath: podruntime/cri-containerd
55
files:
66
- path: /etc/kubelet.sh.conf

yml/docker.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ services:
2121
- /var/lib/cni/bin:/opt/cni/bin:rshared,rbind
2222
- /var/lib/kubelet-plugins:/usr/libexec/kubernetes/kubelet-plugins:rshared,rbind
2323
rootfsPropagation: shared
24-
# `rootfsPropagation: shared` appears to be broken, workaround that issue here.
25-
#command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
26-
command: ["/bin/sh", "-c", "set -ex; mount --make-shared / && exec /usr/local/bin/docker-init /usr/local/bin/dockerd"]
24+
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
2725
runtime:
2826
mkdir: ["/var/lib/kubeadm", "/var/lib/cni/conf", "/var/lib/cni/bin", "/var/lib/kubelet-plugins"]
2927
cgroupsPath: podruntime/docker

0 commit comments

Comments
 (0)