Merge pull request #980 from elezar/add-rprivate-to-mount-options
Some checks are pending
CI Pipeline / code-scanning (push) Waiting to run
CI Pipeline / variables (push) Waiting to run
CI Pipeline / golang (push) Waiting to run
CI Pipeline / image (push) Blocked by required conditions
CI Pipeline / e2e-test (push) Blocked by required conditions

Add rprivate to CDI mount options
This commit is contained in:
Evan Lezar 2025-05-16 07:53:39 +02:00 committed by GitHub
commit 6dfd63f4a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 19 additions and 12 deletions

View File

@ -109,7 +109,8 @@ containerEdits:
- ro
- nosuid
- nodev
- bind
- rbind
- rprivate
`,
},
}

View File

@ -111,7 +111,8 @@ containerEdits:
- ro
- nosuid
- nodev
- bind
- rbind
- rprivate
`,
},
}

View File

@ -52,7 +52,8 @@ func TestIPCMounts(t *testing.T) {
"ro",
"nosuid",
"nodev",
"bind",
"rbind",
"rprivate",
"noexec",
},
},

View File

@ -71,7 +71,8 @@ func (d *mountsToContainerPath) Mounts() ([]Mount, error) {
"ro",
"nosuid",
"nodev",
"bind",
"rbind",
"rprivate",
},
}
mounts = append(mounts, mount)

View File

@ -32,7 +32,8 @@ func TestMountsToContainerPath(t *testing.T) {
"ro",
"nosuid",
"nodev",
"bind",
"rbind",
"rprivate",
}
testCases := []struct {

View File

@ -90,7 +90,8 @@ func (d *mounts) Mounts() ([]Mount, error) {
"ro",
"nosuid",
"nodev",
"bind",
"rbind",
"rprivate",
},
}
}

View File

@ -41,7 +41,8 @@ func TestMounts(t *testing.T) {
"ro",
"nosuid",
"nodev",
"bind",
"rbind",
"rprivate",
}
logger, logHook := testlog.NewNullLogger()

View File

@ -79,12 +79,12 @@ func TestDiscovererFromCSVFiles(t *testing.T) {
{
Path: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
HostPath: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
Options: []string{"ro", "nosuid", "nodev", "bind"},
Options: []string{"ro", "nosuid", "nodev", "rbind", "rprivate"},
},
{
Path: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
HostPath: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
Options: []string{"ro", "nosuid", "nodev", "bind"},
Options: []string{"ro", "nosuid", "nodev", "rbind", "rprivate"},
},
},
expectedHooks: []discover.Hook{
@ -135,12 +135,12 @@ func TestDiscovererFromCSVFiles(t *testing.T) {
{
Path: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
HostPath: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
Options: []string{"ro", "nosuid", "nodev", "bind"},
Options: []string{"ro", "nosuid", "nodev", "rbind", "rprivate"},
},
{
Path: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
HostPath: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
Options: []string{"ro", "nosuid", "nodev", "bind"},
Options: []string{"ro", "nosuid", "nodev", "rbind", "rprivate"},
},
},
expectedHooks: []discover.Hook{
@ -175,7 +175,7 @@ func TestDiscovererFromCSVFiles(t *testing.T) {
{
Path: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
HostPath: "/usr/lib/aarch64-linux-gnu/tegra/libv4l2_nvargus.so",
Options: []string{"ro", "nosuid", "nodev", "bind"},
Options: []string{"ro", "nosuid", "nodev", "rbind", "rprivate"},
},
},
},