InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 10:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

NRI: error on unsupported adjustment

Browse Source 
Also error on eviction requests.

Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2025-12-01 14:24:07 +00:00
parent 0c01da8ccc
commit 98d196b714
2 changed files with 127 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
integration/daemon/nri/nri_test.go
View File

@@ -71,6 +71,66 @@ func TestNRIContainerCreateEnvVarMod(t *testing.T) {
}
}
func TestNRIContainerCreateUnsupportedAdj(t *testing.T) {
skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon")
skip.If(t, testEnv.DaemonInfo.OSType == "windows", "cannot start a separate daemon with NRI enabled on Windows")
skip.If(t, testEnv.IsRootless)
ctx := testutil.StartSpan(baseContext, t)
sockPath := filepath.Join(t.TempDir(), "nri.sock")
d := daemon.New(t)
d.StartWithBusybox(ctx, t,
"--nri-opts=enable=true,socket-path="+sockPath,
"--iptables=false", "--ip6tables=false",
)
defer d.Stop(t)
c := d.NewClientT(t)
tests := []struct {
name string
ctrCreateAdj *api.ContainerAdjustment
expErr string
}{
{
name: "hooks",
ctrCreateAdj: &api.ContainerAdjustment{Hooks: &api.Hooks{CreateRuntime: []*api.Hook{{Path: "/bin/true"}}}},
expErr: "unsupported container adjustments: hooks",
},
{
name: "cdi",
ctrCreateAdj: &api.ContainerAdjustment{CDIDevices: []*api.CDIDevice{{Name: "/dev/somedevice"}}},
expErr: "unsupported container adjustments: CDI",
},
{
name: "cpu",
ctrCreateAdj: &api.ContainerAdjustment{Linux: &api.LinuxContainerAdjustment{Resources: &api.LinuxResources{
Cpu: &api.LinuxCPU{Shares: &api.OptionalUInt64{Value: 123}},
}}},
expErr: "unsupported container adjustments: linux.resources.cpu",
},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
stopPlugin := startBuiltinPlugin(ctx, t, builtinPluginConfig{
pluginName: "nri-test-plugin",
pluginIdx: "00",
sockPath: sockPath,
ctrCreateAdj: tc.ctrCreateAdj,
})
defer stopPlugin()
res, err := c.ContainerCreate(ctx, client.ContainerCreateOptions{Image: "busybox:latest"})
if err != nil {
_, _ = c.ContainerRemove(ctx, res.ID, client.ContainerRemoveOptions{Force: true})
}
assert.Check(t, is.ErrorContains(err, tc.expErr))
})
}
}
func TestNRIContainerCreateAddMount(t *testing.T) {
skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon")
skip.If(t, testEnv.DaemonInfo.OSType == "windows", "cannot start a separate daemon with NRI enabled on Windows")