Remove unused containerRuntime field from CDI spec

This change removes the unused containerRuntime field from the CDI spec
to simplify the initial integrations with runtimes. This field can be
added in an updated spec version if required.

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

SPEC.md

@@ -70,7 +70,6 @@ The key words "must", "must not", "required", "shall", "shall not", "should", "s
 {
     "cdiVersion": "0.1.0",
     "kind": "<name>",
-    "containerRuntime": ["<container-runtime-name>"], (optional)
 
     "devices": [
         {
@@ -97,7 +96,7 @@ The key words "must", "must not", "required", "shall", "shall not", "should", "s
                     "major": <int32> (optional),
                     "minor": <int32> (optional),
                     // file mode for the device
-                    "fileMode": <int> (optional), 
+                    "fileMode": <int> (optional),
                     // 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.
@@ -143,12 +142,6 @@ The key words "must", "must not", "required", "shall", "shall not", "should", "s
       * Valid: `vendor.com/foo`, `foo.bar.baz/foo-bar123.B_az`.
       * Invalid: `foo`, `vendor.com/foo/`, `vendor.com/foo/bar`.
 
-#### Container Runtime
-
-* `containerRuntime` (array of string, OPTIONAL) indicates that this CDI specification targets only a specific container runtime.
-  If this field is indicated, the container runtime MUST use the one that matches its name if non exists it should use the one that does not indicate any `containerRuntime` value.
-  Possible values (not an exhaustive list): docker, podman, gvisor, lxc
-
 #### CDI Devices
 
 The `devices` field describes the set of hardware devices that can be requested by the container runtime user.
@@ -203,8 +196,6 @@ The `containerEdits` field has the following definition:
     * `timeout` (int, OPTIONAL) is the number of seconds before aborting the hook. If set, timeout MUST be greater than zero. If not set container runtime will wait for the hook to return.
 
 ## Error Handling
-  * Two or more files with identical `kind` values and identical `containerRuntime` field.
-    Container runtimes should surface this error when any device with that `kind` is requested.
   * Kind requested is not present in any CDI file.
     Container runtimes should surface an error when a non existent kind is requested.
   * Device (not device node) Requested does not exist.

schema/schema.json

@@ -11,10 +11,6 @@
             "description": "The kind of the device usually of the form 'vendor.com/device'",
             "type": "string"
         },
-        "containerRuntime": {
-            "description": "A list of container runtimes this spec applies to",
-            "$ref": "defs.json#/definitions/ArrayOfStrings"
-        },
         "devices": {
             "type": "array",
             "items": {

specs-go/config.go

@@ -7,9 +7,8 @@ const CurrentVersion = "0.2.0"
 
 // Spec is the base configuration for CDI
 type Spec struct {
-	Version          string   `json:"cdiVersion"`
-	Kind             string   `json:"kind"`
-	ContainerRuntime []string `json:"containerRuntime,omitempty"`
+	Version string `json:"cdiVersion"`
+	Kind    string `json:"kind"`
 
 	Devices        []Device       `json:"devices"`
 	ContainerEdits ContainerEdits `json:"containerEdits,omitempty"`