
Looks like we had our own copy of the "getDevices" code already, so use that code (which also matches the code that's used to _generate_ the spec, so a better match). Moving the code to a separate file, I also noticed that the _unix and _linux code was _exactly_ the same (baring some `//nolint:` comments), so also removing the duplicated code. With this patch applied, we removed the dependency on the libcontainer/devices package (leaving only libcontainer/user). Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
59 lines
1.8 KiB
Go
59 lines
1.8 KiB
Go
// +build !linux,!windows
|
|
|
|
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package oci
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/containerd/containerd/containers"
|
|
)
|
|
|
|
// WithHostDevices adds all the hosts device nodes to the container's spec
|
|
func WithHostDevices(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
|
setLinux(s)
|
|
|
|
devs, err := HostDevices()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
s.Linux.Devices = append(s.Linux.Devices, devs...)
|
|
return nil
|
|
}
|
|
|
|
// WithDevices recursively adds devices from the passed in path and associated cgroup rules for that device.
|
|
// If devicePath is a dir it traverses the dir to add all devices in that dir.
|
|
// If devicePath is not a dir, it attempts to add the single device.
|
|
func WithDevices(devicePath, containerPath, permissions string) SpecOpts {
|
|
return func(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
|
|
devs, err := getDevices(devicePath, containerPath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
s.Linux.Devices = append(s.Linux.Devices, devs...)
|
|
return nil
|
|
}
|
|
}
|
|
|
|
// WithCPUCFS sets the container's Completely fair scheduling (CFS) quota and period
|
|
func WithCPUCFS(quota int64, period uint64) SpecOpts {
|
|
return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
|
|
return nil
|
|
}
|
|
}
|