Skip to content

Commit 8feb5c2

Browse files
committed
investigate devicemapping failures
Signed-off-by: Arjun Raja Yogidas <[email protected]>
1 parent 41ace87 commit 8feb5c2

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

.github/workflows/test.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,18 @@ jobs:
108108
containerd: v1.6.36
109109
runner: "ubuntu-20.04"
110110
arch: amd64
111-
- ubuntu: 22.04
112-
containerd: v1.7.25
113-
runner: "ubuntu-22.04"
114-
arch: amd64
111+
# - ubuntu: 22.04
112+
# containerd: v1.7.25
113+
# runner: "ubuntu-22.04"
114+
# arch: amd64
115115
- ubuntu: 24.04
116116
containerd: v2.0.2
117117
runner: "ubuntu-24.04"
118118
arch: amd64
119-
- ubuntu: 24.04
120-
containerd: v2.0.2
121-
runner: arm64-8core-32gb
122-
arch: arm64
119+
# - ubuntu: 24.04
120+
# containerd: v2.0.2
121+
# runner: arm64-8core-32gb
122+
# arch: arm64
123123
env:
124124
CONTAINERD_VERSION: "${{ matrix.containerd }}"
125125
ARCH: "${{ matrix.arch }}"
@@ -233,21 +233,21 @@ jobs:
233233
rootlesskit: v1.1.1 # Deprecated
234234
target: rootless
235235
arch: amd64
236-
- ubuntu: 22.04
237-
containerd: v1.7.25
238-
rootlesskit: v2.3.2
239-
target: rootless
240-
arch: amd64
241-
- ubuntu: 24.04
242-
containerd: v2.0.2
243-
rootlesskit: v2.3.2
244-
target: rootless
245-
arch: amd64
246-
- ubuntu: 24.04
247-
containerd: v1.7.25
248-
rootlesskit: v2.3.2
249-
target: rootless-port-slirp4netns
250-
arch: amd64
236+
# - ubuntu: 22.04
237+
# containerd: v1.7.25
238+
# rootlesskit: v2.3.2
239+
# target: rootless
240+
# arch: amd64
241+
# - ubuntu: 24.04
242+
# containerd: v2.0.2
243+
# rootlesskit: v2.3.2
244+
# target: rootless
245+
# arch: amd64
246+
# - ubuntu: 24.04
247+
# containerd: v1.7.25
248+
# rootlesskit: v2.3.2
249+
# target: rootless-port-slirp4netns
250+
# arch: amd64
251251
env:
252252
CONTAINERD_VERSION: "${{ matrix.containerd }}"
253253
ARCH: "${{ matrix.arch }}"

pkg/cmd/container/create.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,7 @@ func withInternalLabels(internalLabels internalLabels) (containerd.NewContainerO
773773
}
774774

775775
if len(internalLabels.deviceMapping) > 0 {
776+
log.L.Warn("(TestContainerInspectDevices INFO) pulling deviceMapping from internal labels ")
776777
hostConfigLabel.Devices = append(hostConfigLabel.Devices, internalLabels.deviceMapping...)
777778
}
778779

pkg/cmd/container/run_cgroup_linux.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ func generateCgroupOpts(id string, options types.ContainerCreateOptions, interna
212212
deviceMap.PathInContainer = conPath
213213
deviceMap.CgroupPermissions = mode
214214
internalLabels.deviceMapping = append(internalLabels.deviceMapping, deviceMap)
215+
log.L.Warnf("(TestContainerInspectDevices INFO) setting the device mapping info %v", deviceMap)
215216
}
216217

217218
return opts, nil

0 commit comments

Comments
 (0)