Added Annotations to CDI Spec

cncf-tags · Oct 19, 2022 · b3af822 · b3af822
1 parent 5609688
commit b3af822
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/schema/defs.json b/schema/defs.json
@@ -23,6 +23,14 @@
         "Env": {
             "$ref": "#/definitions/ArrayOfStrings"
         },
+        "mapStringString": {
+            "type": "object",
+            "patternProperties": {
+                ".{1,}": {
+                    "type": "string"
+                }
+            }
+        },
         "DeviceNode": {
             "type": "object",
             "properties": {
@@ -128,6 +136,9 @@
                     }
                 }
             }
+        },
+        "annotations": {
+            "$ref": "#/definitions/mapStringString"
         }
     }
 }
diff --git a/schema/schema.json b/schema/schema.json
@@ -11,6 +11,9 @@
             "description": "The kind of the device usually of the form 'vendor.com/device'",
             "type": "string"
         },
+        "annotations": {
+            "$ref": "defs.json#/definitions/annotations"
+        },
         "devices": {
             "type": "array",
             "items": {
@@ -20,6 +23,9 @@
                       "description": "The name of the device",
                       "type": "string"
                     },
+                    "annotations": {
+                        "$ref": "defs.json#/definitions/annotations"
+                    },
                     "containerEdits": {
                         "$ref": "defs.json#/definitions/containerEdits"
                     }

diff --git a/specs-go/config.go b/specs-go/config.go
@@ -16,8 +16,9 @@ type Spec struct {
 
 // Device is a "Device" a container runtime can add to a container
 type Device struct {
-	Name           string         `json:"name"`
-	ContainerEdits ContainerEdits `json:"containerEdits"`
+	Name           string            `json:"name"`
+	Annotations    map[string]string `json:"annotations"`
+	ContainerEdits ContainerEdits    `json:"containerEdits"`
 }
 
 // ContainerEdits are edits a container runtime must make to the OCI spec to expose the device.