|
3 | 3 | - [Version](#version)
|
4 | 4 | - [Overview](#overview)
|
5 | 5 | - [General considerations](#general-considerations)
|
6 |
| -- [CDI JSON Specification](#well-known-error-codes) |
7 |
| -- [CDI CLI Specification](#well-known-error-codes) |
| 6 | +- [CDI JSON Specification](#cdi-json-specification) |
| 7 | +- [Error Handling](#error-handling) |
8 | 8 |
|
9 | 9 | ## Version
|
10 | 10 |
|
@@ -72,7 +72,7 @@ For the purposes of this proposal, we define the following terms:
|
72 | 72 | - _container runtime_ which refers to the higher level component users tend to interact with for managing containers. It may also include lower level components that implement management of containers and pods (sets of containers). e.g: docker, podman, ...
|
73 | 73 | - _container runtime interface integration_ which refers to a server that implements the Container Runtime Interface (CRI) services, e.g: containerd+cri, cri-o, ...
|
74 | 74 |
|
75 |
| -The key words "must", "must not", "required", "shall", "shall not", "should", "should not", "recommended", "may" and "optional" are used as specified in [RFC 2119][rfc-2119]. |
| 75 | +The keywords "must", "must not", "required", "shall", "shall not", "should", "should not", "recommended", "may" and "optional" are used as specified in [RFC 2119][rfc-2119]. |
76 | 76 |
|
77 | 77 | [rfc-2119]: https://www.ietf.org/rfc/rfc2119.txt
|
78 | 78 |
|
@@ -186,11 +186,11 @@ Note: For a CDI file to be valid, at least one entry must be specified in this a
|
186 | 186 |
|
187 | 187 | #### OCI Edits
|
188 | 188 |
|
189 |
| -The `containerEdits` field describes edits to be made to the OCI specification. Currently the following kinds of edits can be made to the OCI specification: `env`, `devices`, `mounts` and `hooks`. |
| 189 | +The `containerEdits` field describes edits to be made to the OCI specification. Currently, the following kinds of edits can be made to the OCI specification: `env`, `devices`, `mounts` and `hooks`. |
190 | 190 |
|
191 | 191 | The `containerEdits` field is referenced in two places in the specification:
|
192 | 192 | * At the device level, where the edits MUST only be made if the matching device is requested by the container runtime user.
|
193 |
| - * At the container level, where the edits MUST be made if any of the of the device defined in the `devices` field are requested. |
| 193 | + * At the container level, where the edits MUST be made if any of the device defined in the `devices` field are requested. |
194 | 194 |
|
195 | 195 |
|
196 | 196 | The `containerEdits` field has the following definition:
|
@@ -223,11 +223,11 @@ The `containerEdits` field has the following definition:
|
223 | 223 |
|
224 | 224 | ## Error Handling
|
225 | 225 | * Kind requested is not present in any CDI file.
|
226 |
| - Container runtimes should surface an error when a non existent kind is requested. |
| 226 | + Container runtimes should surface an error when a non-existent kind is requested. |
227 | 227 | * Device (not device node) Requested does not exist.
|
228 | 228 | Container runtimes should surface this error when a non existent device is requested.
|
229 | 229 | * "Resource" does not exist (e.g: Mount, Hook, ...).
|
230 |
| - Container runtimes should surface this error when a non existent "resource" is requested (e.g: at "run" time). |
231 |
| - This is because a resource does not need to exist when the spec is written but it needs to exist when the container is created. |
| 230 | + Container runtimes should surface this error when a non-existent "resource" is requested (e.g: at "run" time). |
| 231 | + This is because a resource does not need to exist when the spec is written, but it needs to exist when the container is created. |
232 | 232 | * Hook fails to execute.
|
233 | 233 | Container runtimes should surface an error when hooks fails to execute.
|
0 commit comments