Merge branch 'update-cdi' into 'main'

Determine the minumum required spec version

See merge request nvidia/container-toolkit/container-toolkit!265
This commit is contained in:
Evan Lezar
2023-01-19 11:57:19 +00:00
115 changed files with 847 additions and 14881 deletions

View File

@@ -249,15 +249,20 @@ func (m command) generateSpec(root string, nvidiaCTKPath string) (*specs.Spec, e
allEdits.Append(commonEdits)
// Construct the spec
// TODO: Use the code to determine the minimal version
// We construct the spec and determine the minimum required version based on the specification.
spec := specs.Spec{
Version: "0.4.0",
Version: "NOT_SET",
Kind: "nvidia.com/gpu",
Devices: deviceSpecs,
ContainerEdits: *allEdits.ContainerEdits,
}
minVersion, err := cdi.MinimumRequiredVersion(&spec)
if err != nil {
return nil, fmt.Errorf("failed to get minumum required CDI spec version: %v", err)
}
spec.Version = minVersion
return &spec, nil
}