add device-access-rights to eliot

cmd/utils.go

@@ -194,8 +194,8 @@ func GetRuntimeClient(clicontext *cli.Context, hostname string) runtime.Client {
 	return runtime.NewContainerdClient(
 		context.Background(),
 		clicontext.GlobalDuration("timeout"),
-		clicontext.GlobalString("containerd"),
 		clicontext.String("containerd-snapshotter"),
+		clicontext.GlobalString("containerd"),
 		hostname,
 	)
 }

examples/devices.yml

@@ -0,0 +1,10 @@
+metadata:
+  name: "test"
+spec:
+  containers:
+    - name: "busybox"
+      image: "docker.io/library/busybox:latest"
+      devices:
+        - DeviceType: "c"
+          MajorId: 555
+          MinorId: 0

pkg/api/mapping/api.go

@@ -39,6 +39,7 @@ func MapContainerToInternalModel(containers []*containers.Container) (result []m
 			Args:       container.Args,
 			Env:        container.Env,
 			WorkingDir: container.WorkingDir,
+			Devices:	mapDeviceToInternalModel(container.Devices),
 			Mounts:     mapMountsToInternalModel(container.Mounts),
 			Pipe:       mapPipeToInternalModel(container.Pipe),
 		})
@@ -71,3 +72,14 @@ func mapMountsToInternalModel(mounts []*containers.Mount) (result []model.Mount)
 	}
 	return result
 }
+
+func mapDeviceToInternalModel(devices []*containers.Device) (result []model.Device) {
+	for _, device := range devices {
+		result = append(result, model.Device{
+			DeviceType:  device.DeviceType,
+			MinorId:     device.Minorid,
+			MajorId:     device.Majorid,
+		})
+	}
+	return result
+}

pkg/api/mapping/internal.go

@@ -79,13 +79,25 @@ func MapContainersToAPIModel(source []model.Container) (result []*containers.Con
 			WorkingDir: container.WorkingDir,
 			Args:       container.Args,
 			Env:        container.Env,
+			Devices:    mapDevicesToAPIModel(container.Devices),
 			Mounts:     mapMountsToAPIModel(container.Mounts),
 			Pipe:       mapPipeToAPIModel(container.Pipe),
 		})
 	}
 	return result
 }
 
+func mapDevicesToAPIModel(devices []model.Device) (result []*containers.Device) {
+	for _, device := range devices {
+		result = append(result, &containers.Device{
+			DeviceType:  device.DeviceType,
+			Minorid:     device.MinorId,
+			Majorid:     device.MajorId,
+		})
+	}
+	return result
+}
+
 func mapMountsToAPIModel(mounts []model.Mount) (result []*containers.Mount) {
 	for _, mount := range mounts {
 		result = append(result, &containers.Mount{