Merge pull request #47 from elezar/bump-0.3.0

@elezar thank you. Merging.

Author: bart0sh

README.md

@@ -25,7 +25,7 @@ Additionally runtimes don't uniformly expose a plugin system (or even expose a p
 $ mkdir /etc/cdi
 $ cat > /etc/cdi/vendor.json <<EOF
 {
-  "cdiVersion": "0.2.0",
+  "cdiVersion": "0.3.0",
   "kind": "vendor.com/device",
   "devices": [
     {

SPEC.md

@@ -8,14 +8,15 @@
 
 ## Version
 
-This is CDI **spec** version **0.1.0**.
+This is CDI **spec** version **0.3.0**.
 
 #### Released versions
 
 Released versions of the spec are available as Git tags.
 
 | Tag  | Spec Permalink   | Change |
 | -----| -----------------| -------|
+| v0.3.0 |   | Initial tagged release of Spec |
 
 ## Overview
 
@@ -68,9 +69,8 @@ The key words "must", "must not", "required", "shall", "shall not", "should", "s
 
 ```
 {
-    "cdiVersion": "0.1.0",
+    "cdiVersion": "0.3.0",
     "kind": "<name>",
-    "containerRuntime": ["<container-runtime-name>"], (optional)
 
     "devices": [
         {
@@ -97,7 +97,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 +143,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 +197,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.

pkg/cdi/cache_test.go

@@ -46,7 +46,7 @@ func TestNewCache(t *testing.T) {
 			name: "one spec file",
 			etc: map[string]string{
 				"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -66,7 +66,7 @@ devices:
 			name: "multiple spec files with override",
 			etc: map[string]string{
 				"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -87,7 +87,7 @@ devices:
 			},
 			run: map[string]string{
 				"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -108,7 +108,7 @@ devices:
 			name: "multiple spec files, with conflicts",
 			run: map[string]string{
 				"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -127,7 +127,7 @@ devices:
         minor: 2
 `,
 				"vendor1-other.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -217,7 +217,7 @@ func TestRefreshCache(t *testing.T) {
 				{
 					run: map[string]string{
 						"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -254,7 +254,7 @@ devices:
 				{
 					etc: map[string]string{
 						"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -270,7 +270,7 @@ devices:
 				{
 					run: map[string]string{
 						"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev2"
@@ -313,7 +313,7 @@ devices:
 				{
 					run: map[string]string{
 						"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -325,7 +325,7 @@ devices:
         minor: 1
 `,
 						"vendor1-other.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev2"
@@ -373,7 +373,7 @@ devices:
 				{
 					etc: map[string]string{
 						"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -389,7 +389,7 @@ devices:
 				{
 					run: map[string]string{
 						"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -430,7 +430,7 @@ devices:
 				{
 					run: map[string]string{
 						"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -453,7 +453,7 @@ devices:
 				{
 					run: map[string]string{
 						"vendor1-other.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 devices:
   - name: "dev1"
@@ -583,7 +583,7 @@ func TestInjectDevice(t *testing.T) {
 			cdiSpecs: specDirs{
 				etc: map[string]string{
 					"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 containerEdits:
   env:
@@ -640,7 +640,7 @@ devices:
 			cdiSpecs: specDirs{
 				etc: map[string]string{
 					"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 containerEdits:
   env:
@@ -722,7 +722,7 @@ devices:
 			cdiSpecs: specDirs{
 				etc: map[string]string{
 					"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 containerEdits:
   env:
@@ -881,7 +881,7 @@ devices:
 			cdiSpecs: specDirs{
 				etc: map[string]string{
 					"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 containerEdits:
   env:
@@ -962,7 +962,7 @@ func TestListVendorsAndClasses(t *testing.T) {
 			cdiSpecs: specDirs{
 				etc: map[string]string{
 					"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 containerEdits:
   env:
@@ -992,7 +992,7 @@ devices:
 			cdiSpecs: specDirs{
 				etc: map[string]string{
 					"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 containerEdits:
 devices:
@@ -1014,7 +1014,7 @@ devices:
         minor: 2
 `,
 					"vendor1-other.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/other-device"
 containerEdits:
 devices:
@@ -1050,7 +1050,7 @@ devices:
 			cdiSpecs: specDirs{
 				etc: map[string]string{
 					"vendor1.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor1.com/device"
 containerEdits:
 devices:
@@ -1072,7 +1072,7 @@ devices:
         minor: 2
 `,
 					"vendor2.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor2.com/other-device"
 containerEdits:
 devices:
@@ -1092,7 +1092,7 @@ devices:
         minor: 2
 `,
 					"vendor2-other.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor2.com/another-device"
 containerEdits:
 devices:
@@ -1112,7 +1112,7 @@ devices:
         minor: 2
 `,
 					"vendor3.yaml": `
-cdiVersion: "0.2.0"
+cdiVersion: "0.3.0"
 kind:       "vendor3.com/yet-another-device"
 containerEdits:
 devices: