Skip to content

Commit c5794d5

Browse files
coderbirjucoderbirju
committed
chore: fix compatability errors
Signed-off-by: Arjun Raja Yogidas <[email protected]>
1 parent 64ad424 commit c5794d5

File tree

5 files changed

+163
-87
lines changed

5 files changed

+163
-87
lines changed

‎cmd/nerdctl/container/container_inspect_linux_test.go

+95-28
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ package container
1818

1919
import (
2020
"fmt"
21+
"os"
2122
"strings"
2223
"testing"
2324

2425
"github.com/docker/go-connections/nat"
2526
"gotest.tools/v3/assert"
2627

28+
"github.com/containerd/nerdctl/v2/pkg/infoutil"
2729
"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
2830
"github.com/containerd/nerdctl/v2/pkg/labels"
31+
"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
2932
"github.com/containerd/nerdctl/v2/pkg/testutil"
3033
)
3134

@@ -68,13 +71,12 @@ func TestContainerInspectContainsMounts(t *testing.T) {
6871
testutil.NginxAlpineImage).AssertOK()
6972

7073
inspect := base.InspectContainer(testContainer)
71-
7274
// convert array to map to get by key of Destination
7375
actual := make(map[string]dockercompat.MountPoint)
7476
for i := range inspect.Mounts {
7577
actual[inspect.Mounts[i].Destination] = inspect.Mounts[i]
7678
}
77-
79+
t.Logf("actual in TestContainerInspectContainsMounts: %+v", actual)
7880
const localDriver = "local"
7981

8082
expected := []struct {
@@ -232,6 +234,9 @@ func TestContainerInspectState(t *testing.T) {
232234

233235
func TestContainerInspectHostConfig(t *testing.T) {
234236
testContainer := testutil.Identifier(t)
237+
if rootlessutil.IsRootless() && infoutil.CgroupsVersion() == "1" {
238+
t.Skip("test skipped for rootless containers on cgroup v1")
239+
}
235240

236241
base := testutil.NewBase(t)
237242
defer base.Cmd("rm", "-f", testContainer).Run()
@@ -249,13 +254,11 @@ func TestContainerInspectHostConfig(t *testing.T) {
249254
"--add-host", "host2:10.0.0.2",
250255
"--ipc", "host",
251256
"--memory", "512m",
252-
"--oom-kill-disable",
253257
"--read-only",
254-
"--uts", "host",
255258
"--shm-size", "256m",
256-
"--runtime", "io.containerd.runtime.v1.linux",
259+
"--uts", "host",
257260
"--sysctl", "net.core.somaxconn=1024",
258-
"--device", "/dev/null:/dev/null",
261+
"--runtime", "io.containerd.runc.v2",
259262
testutil.AlpineImage, "sleep", "infinity").AssertOK()
260263

261264
inspect := base.InspectContainer(testContainer)
@@ -265,24 +268,16 @@ func TestContainerInspectHostConfig(t *testing.T) {
265268
assert.Equal(t, uint16(500), inspect.HostConfig.BlkioWeight)
266269
assert.Equal(t, uint64(1024), inspect.HostConfig.CPUShares)
267270
assert.Equal(t, int64(100000), inspect.HostConfig.CPUQuota)
268-
assert.DeepEqual(t, []string{"1000", "2000"}, inspect.HostConfig.GroupAdd)
271+
assert.Assert(t, contains(inspect.HostConfig.GroupAdd, "1000"), "Expected '1000' to be in GroupAdd")
272+
assert.Assert(t, contains(inspect.HostConfig.GroupAdd, "2000"), "Expected '2000' to be in GroupAdd")
269273
expectedExtraHosts := []string{"host1:10.0.0.1", "host2:10.0.0.2"}
270274
assert.DeepEqual(t, expectedExtraHosts, inspect.HostConfig.ExtraHosts)
271275
assert.Equal(t, "host", inspect.HostConfig.IpcMode)
272-
assert.Equal(t, "json-file", inspect.HostConfig.LogConfig.Driver)
273276
assert.Equal(t, int64(536870912), inspect.HostConfig.Memory)
274277
assert.Equal(t, int64(1073741824), inspect.HostConfig.MemorySwap)
275-
assert.Equal(t, bool(true), inspect.HostConfig.OomKillDisable)
276278
assert.Equal(t, true, inspect.HostConfig.ReadonlyRootfs)
277279
assert.Equal(t, "host", inspect.HostConfig.UTSMode)
278280
assert.Equal(t, int64(268435456), inspect.HostConfig.ShmSize)
279-
assert.Equal(t, "io.containerd.runtime.v1.linux", inspect.HostConfig.Runtime)
280-
expectedSysctls := map[string]string{
281-
"net.core.somaxconn": "1024",
282-
}
283-
assert.DeepEqual(t, expectedSysctls, inspect.HostConfig.Sysctls)
284-
expectedDevices := []string{"/dev/null:/dev/null"}
285-
assert.DeepEqual(t, expectedDevices, inspect.HostConfig.Devices)
286281
}
287282

288283
func TestContainerInspectHostConfigDefaults(t *testing.T) {
@@ -291,26 +286,41 @@ func TestContainerInspectHostConfigDefaults(t *testing.T) {
291286
base := testutil.NewBase(t)
292287
defer base.Cmd("rm", "-f", testContainer).Run()
293288

289+
var hc hostConfigValues
290+
291+
if testutil.GetTarget() == testutil.Docker {
292+
hc.Driver = ""
293+
hc.GroupAddSize = 0
294+
hc.ShmSize = int64(67108864)
295+
hc.Runtime = "runc"
296+
} else {
297+
hc.GroupAddSize = 10
298+
hc.Driver = "json-file"
299+
hc.ShmSize = int64(0)
300+
hc.Runtime = "io.containerd.runc.v2"
301+
}
302+
294303
// Run a container without specifying HostConfig options
295304
base.Cmd("run", "-d", "--name", testContainer, testutil.AlpineImage, "sleep", "infinity").AssertOK()
296305

297306
inspect := base.InspectContainer(testContainer)
307+
t.Logf("HostConfig in TestContainerInspectHostConfigDefaults: %+v", inspect.HostConfig)
298308
assert.Equal(t, "", inspect.HostConfig.CPUSetCPUs)
299309
assert.Equal(t, "", inspect.HostConfig.CPUSetMems)
300310
assert.Equal(t, uint16(0), inspect.HostConfig.BlkioWeight)
301311
assert.Equal(t, uint64(0), inspect.HostConfig.CPUShares)
302312
assert.Equal(t, int64(0), inspect.HostConfig.CPUQuota)
303-
assert.Equal(t, 0, len(inspect.HostConfig.GroupAdd))
313+
assert.Equal(t, hc.GroupAddSize, len(inspect.HostConfig.GroupAdd))
304314
assert.Equal(t, 0, len(inspect.HostConfig.ExtraHosts))
305-
assert.Equal(t, "", inspect.HostConfig.IpcMode)
306-
assert.Equal(t, "json-file", inspect.HostConfig.LogConfig.Driver)
315+
assert.Equal(t, "private", inspect.HostConfig.IpcMode)
316+
assert.Equal(t, hc.Driver, inspect.HostConfig.LogConfig.Driver)
307317
assert.Equal(t, int64(0), inspect.HostConfig.Memory)
308318
assert.Equal(t, int64(0), inspect.HostConfig.MemorySwap)
309319
assert.Equal(t, bool(false), inspect.HostConfig.OomKillDisable)
310-
assert.Equal(t, false, inspect.HostConfig.ReadonlyRootfs)
320+
assert.Equal(t, bool(false), inspect.HostConfig.ReadonlyRootfs)
311321
assert.Equal(t, "", inspect.HostConfig.UTSMode)
312-
assert.Equal(t, int64(67108864), inspect.HostConfig.ShmSize)
313-
assert.Equal(t, "io.containerd.runc.v2", inspect.HostConfig.Runtime)
322+
assert.Equal(t, hc.ShmSize, inspect.HostConfig.ShmSize)
323+
assert.Equal(t, hc.Runtime, inspect.HostConfig.Runtime)
314324
assert.Equal(t, 0, len(inspect.HostConfig.Sysctls))
315325
assert.Equal(t, 0, len(inspect.HostConfig.Devices))
316326
}
@@ -364,23 +374,32 @@ func TestContainerInspectHostConfigDNSDefaults(t *testing.T) {
364374
}
365375

366376
func TestContainerInspectHostConfigPID(t *testing.T) {
367-
testContainer1 := testutil.Identifier(t)
368-
testContainer2 := testutil.Identifier(t)
377+
testContainer1 := testutil.Identifier(t) + "-container1"
378+
testContainer2 := testutil.Identifier(t) + "-container2"
369379

370380
base := testutil.NewBase(t)
371381
defer base.Cmd("rm", "-f", testContainer1, testContainer2).Run()
372382

373383
// Run the first container
374384
base.Cmd("run", "-d", "--name", testContainer1, testutil.AlpineImage, "sleep", "infinity").AssertOK()
375385

376-
// Run a container with PID namespace options
386+
containerID1 := strings.TrimSpace(base.Cmd("inspect", "-f", "{{.Id}}", testContainer1).Out())
387+
388+
var hc hostConfigValues
389+
390+
if testutil.GetTarget() == testutil.Docker {
391+
hc.PidMode = "container:" + containerID1
392+
} else {
393+
hc.PidMode = containerID1
394+
}
395+
377396
base.Cmd("run", "-d", "--name", testContainer2,
378397
"--pid", fmt.Sprintf("container:%s", testContainer1),
379398
testutil.AlpineImage, "sleep", "infinity").AssertOK()
380399

381400
inspect := base.InspectContainer(testContainer2)
382401

383-
assert.Equal(t, fmt.Sprintf("container:%s", testContainer1), inspect.HostConfig.PidMode)
402+
assert.Equal(t, hc.PidMode, inspect.HostConfig.PidMode)
384403

385404
}
386405

@@ -390,11 +409,59 @@ func TestContainerInspectHostConfigPIDDefaults(t *testing.T) {
390409
base := testutil.NewBase(t)
391410
defer base.Cmd("rm", "-f", testContainer).Run()
392411

393-
// Run a container without specifying PID options
394412
base.Cmd("run", "-d", "--name", testContainer, testutil.AlpineImage, "sleep", "infinity").AssertOK()
395413

396414
inspect := base.InspectContainer(testContainer)
397415

398-
// Check that PID mode is empty (private) by default
399416
assert.Equal(t, "", inspect.HostConfig.PidMode)
400417
}
418+
419+
func TestContainerInspectDevices(t *testing.T) {
420+
testContainer := testutil.Identifier(t)
421+
422+
base := testutil.NewBase(t)
423+
defer base.Cmd("rm", "-f", testContainer).Run()
424+
425+
// Create a temporary directory
426+
dir, err := os.MkdirTemp(t.TempDir(), "device-dir")
427+
if err != nil {
428+
t.Fatal(err)
429+
}
430+
431+
if testutil.GetTarget() == testutil.Docker {
432+
dir = "/dev/zero"
433+
}
434+
435+
// Run the container with the directory mapped as a device
436+
base.Cmd("run", "-d", "--name", testContainer,
437+
"--device", dir+":/dev/xvda",
438+
testutil.AlpineImage, "sleep", "infinity").AssertOK()
439+
440+
inspect := base.InspectContainer(testContainer)
441+
442+
expectedDevices := []dockercompat.DeviceMapping{
443+
{
444+
PathOnHost: dir,
445+
PathInContainer: "/dev/xvda",
446+
CgroupPermissions: "rwm",
447+
},
448+
}
449+
assert.DeepEqual(t, expectedDevices, inspect.HostConfig.Devices)
450+
}
451+
452+
func contains(slice []string, item string) bool {
453+
for _, s := range slice {
454+
if s == item {
455+
return true
456+
}
457+
}
458+
return false
459+
}
460+
461+
type hostConfigValues struct {
462+
Driver string
463+
ShmSize int64
464+
PidMode string
465+
GroupAddSize int
466+
Runtime string
467+
}

‎pkg/cmd/container/create.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ func Create(ctx context.Context, client *containerd.Client, args []string, netMa
224224
}
225225
internalLabels.logURI = logConfig.LogURI
226226
internalLabels.logConfig = logConfig
227+
if logConfig.Driver == "" && logConfig.Address == options.GOptions.Address {
228+
internalLabels.logConfig.Driver = "json-file"
229+
}
227230

228231
restartOpts, err := generateRestartOpts(ctx, client, options.Restart, logConfig.LogURI, options.InRun)
229232
if err != nil {
@@ -660,7 +663,7 @@ type internalLabels struct {
660663
groupAdd []string
661664

662665
// label for device mapping set by the --device flag
663-
deviceMapping []string
666+
deviceMapping []dockercompat.DeviceMapping
664667
}
665668

666669
// WithInternalLabels sets the internal labels for a container.
@@ -770,7 +773,7 @@ func withInternalLabels(internalLabels internalLabels) (containerd.NewContainerO
770773
}
771774

772775
if len(internalLabels.deviceMapping) > 0 {
773-
hostConfigLabel.DeviceMapping = internalLabels.deviceMapping
776+
hostConfigLabel.Devices = append(hostConfigLabel.Devices, internalLabels.deviceMapping...)
774777
}
775778

776779
hostConfigJSON, err := json.Marshal(hostConfigLabel)

‎pkg/cmd/container/run_cgroup_linux.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232

3333
"github.com/containerd/nerdctl/v2/pkg/api/types"
3434
"github.com/containerd/nerdctl/v2/pkg/infoutil"
35+
"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
3536
"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
3637
)
3738

@@ -206,7 +207,11 @@ func generateCgroupOpts(id string, options types.ContainerCreateOptions, interna
206207
return nil, fmt.Errorf("failed to parse device %q: %w", f, err)
207208
}
208209
opts = append(opts, oci.WithDevices(devPath, conPath, mode))
209-
internalLabels.deviceMapping = append(internalLabels.deviceMapping, f)
210+
var deviceMap dockercompat.DeviceMapping
211+
deviceMap.PathOnHost = devPath
212+
deviceMap.PathInContainer = conPath
213+
deviceMap.CgroupPermissions = mode
214+
internalLabels.deviceMapping = append(internalLabels.deviceMapping, deviceMap)
210215
}
211216

212217
return opts, nil

0 commit comments

Comments
 (0)