github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2990 from jhowardmsft/jjh/bumpruntimespec

Browse Source 
Vendor opencontainers/runtime-spec 29686dbc
This commit is contained in:
Phil Estes
2019-02-10 16:48:05 -08:00
committed by GitHub
parent 4543e32a8b 98766e863e
commit b02ab6c742
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@@ -19,7 +19,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.0
github.com/gogo/protobuf v1.0.0 github.com/gogo/protobuf v1.0.0
github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef
github.com/golang/protobuf v1.1.0 github.com/golang/protobuf v1.1.0
github.com/opencontainers/runtime-spec eba862dc2470385a233c7507392675cbeadf7353 # v1.0.1-45-geba862d github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
github.com/opencontainers/runc 12f6a991201fdb8f82579582d5e00e28fba06d0a github.com/opencontainers/runc 12f6a991201fdb8f82579582d5e00e28fba06d0a
github.com/sirupsen/logrus v1.0.3 github.com/sirupsen/logrus v1.0.3
github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c

24
vendor/github.com/opencontainers/runtime-spec/specs-go/config.go generated vendored
View File

@@ -38,7 +38,9 @@ type Process struct {
// User specifies user information for the process. // User specifies user information for the process.
User User `json:"user"` User User `json:"user"`
// Args specifies the binary and arguments for the application to execute. // Args specifies the binary and arguments for the application to execute.
Args []string `json:"args"` Args []string `json:"args,omitempty"`
// CommandLine specifies the full command line for the application to execute on Windows.
CommandLine string `json:"commandLine,omitempty" platform:"windows"`
// Env populates the process environment for the process. // Env populates the process environment for the process.
Env []string `json:"env,omitempty"` Env []string `json:"env,omitempty"`
// Cwd is the current working directory for the process and must be // Cwd is the current working directory for the process and must be
@@ -160,8 +162,8 @@ type Linux struct {
ReadonlyPaths []string `json:"readonlyPaths,omitempty"` ReadonlyPaths []string `json:"readonlyPaths,omitempty"`
// MountLabel specifies the selinux context for the mounts in the container. // MountLabel specifies the selinux context for the mounts in the container.
MountLabel string `json:"mountLabel,omitempty"` MountLabel string `json:"mountLabel,omitempty"`
// IntelRdt contains Intel Resource Director Technology (RDT) information // IntelRdt contains Intel Resource Director Technology (RDT) information for
// for handling resource constraints (e.g., L3 cache) for the container // handling resource constraints (e.g., L3 cache, memory bandwidth) for the container
IntelRdt *LinuxIntelRdt `json:"intelRdt,omitempty"` IntelRdt *LinuxIntelRdt `json:"intelRdt,omitempty"`
} }
@@ -528,7 +530,7 @@ type VMHypervisor struct {
// Path is the host path to the hypervisor used to manage the virtual machine. // Path is the host path to the hypervisor used to manage the virtual machine.
Path string `json:"path"` Path string `json:"path"`
// Parameters specifies parameters to pass to the hypervisor. // Parameters specifies parameters to pass to the hypervisor.
Parameters string `json:"parameters,omitempty"` Parameters []string `json:"parameters,omitempty"`
} }
// VMKernel contains information about the kernel to use for a virtual machine. // VMKernel contains information about the kernel to use for a virtual machine.
@@ -536,7 +538,7 @@ type VMKernel struct {
// Path is the host path to the kernel used to boot the virtual machine. // Path is the host path to the kernel used to boot the virtual machine.
Path string `json:"path"` Path string `json:"path"`
// Parameters specifies parameters to pass to the kernel. // Parameters specifies parameters to pass to the kernel.
Parameters string `json:"parameters,omitempty"` Parameters []string `json:"parameters,omitempty"`
// InitRD is the host path to an initial ramdisk to be used by the kernel. // InitRD is the host path to an initial ramdisk to be used by the kernel.
InitRD string `json:"initrd,omitempty"` InitRD string `json:"initrd,omitempty"`
} }
@@ -623,10 +625,18 @@ type LinuxSyscall struct {
Args []LinuxSeccompArg `json:"args,omitempty"` Args []LinuxSeccompArg `json:"args,omitempty"`
} }
// LinuxIntelRdt has container runtime resource constraints // LinuxIntelRdt has container runtime resource constraints for Intel RDT
// for Intel RDT/CAT which introduced in Linux 4.10 kernel // CAT and MBA features which introduced in Linux 4.10 and 4.12 kernel
type LinuxIntelRdt struct { type LinuxIntelRdt struct {
// The identity for RDT Class of Service
ClosID string `json:"closID,omitempty"`
// The schema for L3 cache id and capacity bitmask (CBM) // The schema for L3 cache id and capacity bitmask (CBM)
// Format: "L3:<cache_id0>=<cbm0>;<cache_id1>=<cbm1>;..." // Format: "L3:<cache_id0>=<cbm0>;<cache_id1>=<cbm1>;..."
L3CacheSchema string `json:"l3CacheSchema,omitempty"` L3CacheSchema string `json:"l3CacheSchema,omitempty"`
// The schema of memory bandwidth per L3 cache id
// Format: "MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;..."
// The unit of memory bandwidth is specified in "percentages" by
// default, and in "MBps" if MBA Software Controller is enabled.
MemBwSchema string `json:"memBwSchema,omitempty"`
} }