Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion controllers/object_controls.go
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,11 @@ func transformRuntimeConfigAndSocketMounts(obj *appsv1.DaemonSet, runtime string
setContainerEnv(container, socketEnvvarName, DefaultRuntimeSocketTargetDir+sourceSocketFileName)

volMountSocketName := fmt.Sprintf("%s-socket", runtime)
volMountSocket := corev1.VolumeMount{Name: volMountSocketName, MountPath: DefaultRuntimeSocketTargetDir}
// HostToContainer propagation lets host unmounts propagate into the
// toolkit container, so host mounts (e.g. ZFS datasets) mounted under
// the runtime socket directory are not pinned in the container's mount
// namespace after they are unmounted on the host. See issue #3083.
volMountSocket := corev1.VolumeMount{Name: volMountSocketName, MountPath: DefaultRuntimeSocketTargetDir, MountPropagation: ptr.To(corev1.MountPropagationHostToContainer)}
container.VolumeMounts = append(container.VolumeMounts, volMountSocket)

socketVol := corev1.Volume{Name: volMountSocketName, VolumeSource: corev1.VolumeSource{HostPath: &corev1.HostPathVolumeSource{Path: path.Dir(runtimeSocketFile)}}}
Expand Down
12 changes: 6 additions & 6 deletions controllers/transforms_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ func TestTransformForRuntime(t *testing.T) {
VolumeMounts: []corev1.VolumeMount{
{Name: "containerd-config", MountPath: DefaultRuntimeConfigTargetDir},
{Name: "containerd-drop-in-config", MountPath: "/runtime/config-dir.d/"},
{Name: "containerd-socket", MountPath: DefaultRuntimeSocketTargetDir},
{Name: "containerd-socket", MountPath: DefaultRuntimeSocketTargetDir, MountPropagation: ptr.To(corev1.MountPropagationHostToContainer)},
},
}),
},
Expand Down Expand Up @@ -457,7 +457,7 @@ func TestTransformForRuntime(t *testing.T) {
VolumeMounts: []corev1.VolumeMount{
{Name: "containerd-config", MountPath: DefaultRuntimeConfigTargetDir},
{Name: "containerd-drop-in-config", MountPath: "/runtime/config-dir.d/"},
{Name: "containerd-socket", MountPath: DefaultRuntimeSocketTargetDir},
{Name: "containerd-socket", MountPath: DefaultRuntimeSocketTargetDir, MountPropagation: ptr.To(corev1.MountPropagationHostToContainer)},
},
}),
},
Expand Down Expand Up @@ -491,7 +491,7 @@ func TestTransformForRuntime(t *testing.T) {
VolumeMounts: []corev1.VolumeMount{
{Name: "containerd-config", MountPath: DefaultRuntimeConfigTargetDir},
{Name: "containerd-drop-in-config", MountPath: "/runtime/config-dir.d/"},
{Name: "containerd-socket", MountPath: DefaultRuntimeSocketTargetDir},
{Name: "containerd-socket", MountPath: DefaultRuntimeSocketTargetDir, MountPropagation: ptr.To(corev1.MountPropagationHostToContainer)},
},
}),
},
Expand Down Expand Up @@ -535,7 +535,7 @@ func TestTransformForRuntime(t *testing.T) {
},
VolumeMounts: []corev1.VolumeMount{
{Name: "docker-config", MountPath: DefaultRuntimeConfigTargetDir},
{Name: "docker-socket", MountPath: DefaultRuntimeSocketTargetDir},
{Name: "docker-socket", MountPath: DefaultRuntimeSocketTargetDir, MountPropagation: ptr.To(corev1.MountPropagationHostToContainer)},
},
}),
},
Expand Down Expand Up @@ -934,7 +934,7 @@ func TestTransformToolkit(t *testing.T) {
VolumeMounts: []corev1.VolumeMount{
{Name: "containerd-config", MountPath: "/runtime/config-dir/"},
{Name: "containerd-drop-in-config", MountPath: "/runtime/config-dir.d/"},
{Name: "containerd-socket", MountPath: "/runtime/sock-dir/"},
{Name: "containerd-socket", MountPath: "/runtime/sock-dir/", MountPropagation: ptr.To(corev1.MountPropagationHostToContainer)},
},
}).
WithHostPathVolume("containerd-config", "/etc/containerd", ptr.To(corev1.HostPathDirectoryOrCreate)).
Expand Down Expand Up @@ -1014,7 +1014,7 @@ func TestTransformToolkit(t *testing.T) {
VolumeMounts: []corev1.VolumeMount{
{Name: "containerd-config", MountPath: "/runtime/config-dir/"},
{Name: "containerd-drop-in-config", MountPath: "/runtime/config-dir.d/"},
{Name: "containerd-socket", MountPath: "/runtime/sock-dir/"},
{Name: "containerd-socket", MountPath: "/runtime/sock-dir/", MountPropagation: ptr.To(corev1.MountPropagationHostToContainer)},
},
}).
WithHostPathVolume("containerd-config", "/var/lib/rancher/k3s/agent/etc/containerd", ptr.To(corev1.HostPathDirectoryOrCreate)).
Expand Down