Skip to content

Commit df2bcab

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Fix pods stuck terminating." into stable/yoga
2 parents c45940f + ed3bfad commit df2bcab

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
187187
--pid host \\
188188
--network host \\
189189
--entrypoint /hyperkube \\
190-
--volume /:/rootfs:ro \\
190+
--volume /:/rootfs:rslave,ro \\
191191
--volume /etc/cni/net.d:/etc/cni/net.d:ro,z \\
192192
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
193193
--volume /usr/lib/os-release:/usr/lib/os-release:ro \\

magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
8585
--pid host \\
8686
--network host \\
8787
--entrypoint /hyperkube \\
88-
--volume /:/rootfs:ro \\
88+
--volume /:/rootfs:rslave,ro \\
8989
--volume /etc/cni/net.d:/etc/cni/net.d:ro,z \\
9090
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
9191
--volume /usr/lib/os-release:/usr/lib/os-release:ro \\

0 commit comments

Comments
 (0)