github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

CRI: Add devices to ContainerConfig

Browse Source
This commit is contained in:
Pengfei Ni 2016-10-31 16:04:35 +08:00
parent 07f78836ea
commit 11245be0fe
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/kubelet/api/v1alpha1/runtime/api.proto
View File

@ -428,6 +428,19 @@ message ContainerMetadata {
optional uint32 attempt = 2; optional uint32 attempt = 2;
} }
// Device specifies a host device to mount into a container.
message Device {
// The path of the device within the container.
optional string container_path = 1;
// The path of the device on the host.
optional string host_path = 2;
// Cgroups permissions of the device, candidates are one or more of
// * r - allows container to read from the specified device.
// * w - allows container to write to the specified device.
// * m - allows container to create device files that do not yet exist.
optional string permissions = 3;
}
// ContainerConfig holds all the required and optional fields for creating a // ContainerConfig holds all the required and optional fields for creating a
// container. // container.
message ContainerConfig { message ContainerConfig {
@ -444,25 +457,27 @@ message ContainerConfig {
repeated string args = 4; repeated string args = 4;
// Current working directory of the command. // Current working directory of the command.
optional string working_dir = 5; optional string working_dir = 5;
// List of environment variable to set in the container // List of environment variable to set in the container.
repeated KeyValue envs = 6; repeated KeyValue envs = 6;
// Mounts specifies mounts for the container // Mounts specifies mounts for the container.
repeated Mount mounts = 7; repeated Mount mounts = 7;
// Devices specifies devices for the container.
repeated Device devices = 8;
// Labels are key value pairs that may be used to scope and select individual resources. // Labels are key value pairs that may be used to scope and select individual resources.
// Label keys are of the form: // Label keys are of the form:
// label-key ::= prefixed-name | name // label-key ::= prefixed-name | name
// prefixed-name ::= prefix '/' name // prefixed-name ::= prefix '/' name
// prefix ::= DNS_SUBDOMAIN // prefix ::= DNS_SUBDOMAIN
// name ::= DNS_LABEL // name ::= DNS_LABEL
map<string, string> labels = 8; map<string, string> labels = 9;
// Annotations is an unstructured key value map that may be set by external // Annotations is an unstructured key value map that may be set by external
// tools to store and retrieve arbitrary metadata. // tools to store and retrieve arbitrary metadata.
map<string, string> annotations = 9; map<string, string> annotations = 10;
// If set, run container in privileged mode. // If set, run container in privileged mode.
// Processes in privileged containers are essentially equivalent to root on the host. // Processes in privileged containers are essentially equivalent to root on the host.
optional bool privileged = 10; optional bool privileged = 11;
// If set, the root filesystem of the container is read-only. // If set, the root filesystem of the container is read-only.
optional bool readonly_rootfs = 11; optional bool readonly_rootfs = 12;
// Path relative to PodSandboxConfig.LogDirectory for container to store // Path relative to PodSandboxConfig.LogDirectory for container to store
// the log (STDOUT and STDERR) on the host. // the log (STDOUT and STDERR) on the host.
// E.g., // E.g.,
@ -473,19 +488,19 @@ message ContainerConfig {
// container logs are under active discussion in // container logs are under active discussion in
// https://issues.k8s.io/24677. There *may* be future change of direction // https://issues.k8s.io/24677. There *may* be future change of direction
// for logging as the discussion carries on. // for logging as the discussion carries on.
optional string log_path = 12; optional string log_path = 13;
// The hash of container config // The hash of container config
// Variables for interactive containers, these have very specialized // Variables for interactive containers, these have very specialized
// use-cases (e.g. debugging). // use-cases (e.g. debugging).
// TODO: Determine if we need to continue supporting these fields that are // TODO: Determine if we need to continue supporting these fields that are
// part of Kubernetes's Container Spec. // part of Kubernetes's Container Spec.
optional bool stdin = 13; optional bool stdin = 14;
optional bool stdin_once = 14; optional bool stdin_once = 15;
optional bool tty = 15; optional bool tty = 16;
// Linux contains configuration specific to Linux containers. // Linux contains configuration specific to Linux containers.
optional LinuxContainerConfig linux = 16; optional LinuxContainerConfig linux = 17;
} }
message CreateContainerRequest { message CreateContainerRequest {