 9bc8d63c9f
			
		
	
	9bc8d63c9f
	
	
	
		
			
			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>
		
			
				
	
	
		
			146 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			146 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // +build linux
 | |
| 
 | |
| /*
 | |
|    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"
 | |
| 	"github.com/containerd/containerd/pkg/cap"
 | |
| 	specs "github.com/opencontainers/runtime-spec/specs-go"
 | |
| )
 | |
| 
 | |
| // 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.
 | |
| // If containerPath is not set then the device path is used for the container path.
 | |
| 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
 | |
| 		}
 | |
| 		for _, dev := range devs {
 | |
| 			s.Linux.Devices = append(s.Linux.Devices, dev)
 | |
| 			s.Linux.Resources.Devices = append(s.Linux.Resources.Devices, specs.LinuxDeviceCgroup{
 | |
| 				Allow:  true,
 | |
| 				Type:   dev.Type,
 | |
| 				Major:  &dev.Major,
 | |
| 				Minor:  &dev.Minor,
 | |
| 				Access: permissions,
 | |
| 			})
 | |
| 		}
 | |
| 		return nil
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // WithMemorySwap sets the container's swap in bytes
 | |
| func WithMemorySwap(swap int64) SpecOpts {
 | |
| 	return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
 | |
| 		setResources(s)
 | |
| 		if s.Linux.Resources.Memory == nil {
 | |
| 			s.Linux.Resources.Memory = &specs.LinuxMemory{}
 | |
| 		}
 | |
| 		s.Linux.Resources.Memory.Swap = &swap
 | |
| 		return nil
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // WithPidsLimit sets the container's pid limit or maximum
 | |
| func WithPidsLimit(limit int64) SpecOpts {
 | |
| 	return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
 | |
| 		setResources(s)
 | |
| 		if s.Linux.Resources.Pids == nil {
 | |
| 			s.Linux.Resources.Pids = &specs.LinuxPids{}
 | |
| 		}
 | |
| 		s.Linux.Resources.Pids.Limit = limit
 | |
| 		return nil
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // WithCPUShares sets the container's cpu shares
 | |
| func WithCPUShares(shares uint64) SpecOpts {
 | |
| 	return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
 | |
| 		setCPU(s)
 | |
| 		s.Linux.Resources.CPU.Shares = &shares
 | |
| 		return nil
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // WithCPUs sets the container's cpus/cores for use by the container
 | |
| func WithCPUs(cpus string) SpecOpts {
 | |
| 	return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
 | |
| 		setCPU(s)
 | |
| 		s.Linux.Resources.CPU.Cpus = cpus
 | |
| 		return nil
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // WithCPUsMems sets the container's cpu mems for use by the container
 | |
| func WithCPUsMems(mems string) SpecOpts {
 | |
| 	return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
 | |
| 		setCPU(s)
 | |
| 		s.Linux.Resources.CPU.Mems = mems
 | |
| 		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 {
 | |
| 		setCPU(s)
 | |
| 		s.Linux.Resources.CPU.Quota = "a
 | |
| 		s.Linux.Resources.CPU.Period = &period
 | |
| 		return nil
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // WithAllCurrentCapabilities propagates the effective capabilities of the caller process to the container process.
 | |
| // The capability set may differ from WithAllKnownCapabilities when running in a container.
 | |
| var WithAllCurrentCapabilities = func(ctx context.Context, client Client, c *containers.Container, s *Spec) error {
 | |
| 	caps, err := cap.Current()
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 	return WithCapabilities(caps)(ctx, client, c, s)
 | |
| }
 | |
| 
 | |
| // WithAllKnownCapabilities sets all the the known linux capabilities for the container process
 | |
| var WithAllKnownCapabilities = func(ctx context.Context, client Client, c *containers.Container, s *Spec) error {
 | |
| 	caps := cap.Known()
 | |
| 	return WithCapabilities(caps)(ctx, client, c, s)
 | |
| }
 | |
| 
 | |
| // WithoutRunMount removes the `/run` inside the spec
 | |
| func WithoutRunMount(ctx context.Context, client Client, c *containers.Container, s *Spec) error {
 | |
| 	return WithoutMounts("/run")(ctx, client, c, s)
 | |
| }
 |