UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 08:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Also set Runtime file v1 containerd runtime config

Browse Source 
This ensures that older versions of containerd that may be expecting
this over options.BinaryName should continue to work.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-05-25 20:10:28 +02:00
parent 4cd719692e
commit 15cbd54d1c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/container/containerd/config.go
View File

@ -48,6 +48,9 @@ func (config *config) update(runtimeClass string, runtimeType string, runtimeBin
} }
config.initRuntime(runtimeClassPath, runtimeType, "BinaryName", runtimeBinary) config.initRuntime(runtimeClassPath, runtimeType, "BinaryName", runtimeBinary)
if config.version == 1 {
config.initRuntime(runtimeClassPath, runtimeType, "Runtime", runtimeBinary)
}
if setAsDefault { if setAsDefault {
defaultRuntimeNamePath := config.defaultRuntimeNamePath() defaultRuntimeNamePath := config.defaultRuntimeNamePath()

2
tools/container/containerd/config_v1_test.go
View File

@ -349,6 +349,7 @@ func runtimeMapV1(binary string) map[string]interface{} {
"privileged_without_host_devices": false, "privileged_without_host_devices": false,
"options": map[string]interface{}{ "options": map[string]interface{}{
"BinaryName": binary, "BinaryName": binary,
"Runtime": binary,
}, },
} }
} }
@ -376,6 +377,7 @@ func runcRuntimeConfigMapV1(binary string) map[string]interface{} {
"options": map[string]interface{}{ "options": map[string]interface{}{
"runc-option": "value", "runc-option": "value",
"BinaryName": binary, "BinaryName": binary,
"Runtime": binary,
}, },
} }
} }