UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-06-26 18:18:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use nvidia-container-runtime.experimental as wrapper

Browse Source 
This change switches to using nvidia-container-runtime.experimental as the
wrapper name over nvidia-container-runtime-experimental. This is consistent
with upcoming mode-specific binaries.

The wrapper is created at nvidia-container-runtime.experimental.real.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar
2023-02-24 17:16:27 +02:00
parent 9435343541
commit ec8a92c17f
10 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ func TestUpdateV1ConfigDefaultRuntime(t *testing.T) {
setAsDefault: true,
runtimeClass: "nvidia-experimental",
expectedDefaultRuntimeName: nil,
expectedDefaultRuntimeBinary: "/test/runtime/dir/nvidia-container-runtime-experimental",
expectedDefaultRuntimeBinary: "/test/runtime/dir/nvidia-container-runtime.experimental",
},
{
legacyConfig: false,
@@ -128,7 +128,7 @@ func TestUpdateV1Config(t *testing.T) {
expectedBinaries := []string{
"/test/runtime/dir/nvidia-container-runtime",
"/test/runtime/dir/nvidia-container-runtime-experimental",
"/test/runtime/dir/nvidia-container-runtime.experimental",
}
testCases := []struct {
@@ -195,7 +195,7 @@ func TestUpdateV1ConfigWithRuncPresent(t *testing.T) {
expectedBinaries := []string{
runcBinary,
"/test/runtime/dir/nvidia-container-runtime",
"/test/runtime/dir/nvidia-container-runtime-experimental",
"/test/runtime/dir/nvidia-container-runtime.experimental",
}
testCases := []struct {
@@ -274,7 +274,7 @@ func TestRevertV1Config(t *testing.T) {
"containerd": map[string]interface{}{
"runtimes": map[string]interface{}{
"nvidia": runtimeMapV1("/test/runtime/dir/nvidia-container-runtime"),
"nvidia-experimental": runtimeMapV1("/test/runtime/dir/nvidia-container-runtime-experimental"),
"nvidia-experimental": runtimeMapV1("/test/runtime/dir/nvidia-container-runtime.experimental"),
},
},
},
@@ -289,7 +289,7 @@ func TestRevertV1Config(t *testing.T) {
"containerd": map[string]interface{}{
"runtimes": map[string]interface{}{
"nvidia": runtimeMapV1("/test/runtime/dir/nvidia-container-runtime"),
"nvidia-experimental": runtimeMapV1("/test/runtime/dir/nvidia-container-runtime-experimental"),
"nvidia-experimental": runtimeMapV1("/test/runtime/dir/nvidia-container-runtime.experimental"),
},
"default_runtime": defaultRuntimeV1("/test/runtime/dir/nvidia-container-runtime"),
"default_runtime_name": "nvidia",

8
tools/container/containerd/config_v2_test.go
View File

@@ -92,7 +92,7 @@ func TestUpdateV2Config(t *testing.T) {
expectedBinaries := []string{
"/test/runtime/dir/nvidia-container-runtime",
"/test/runtime/dir/nvidia-container-runtime-experimental",
"/test/runtime/dir/nvidia-container-runtime.experimental",
}
testCases := []struct {
@@ -160,7 +160,7 @@ func TestUpdateV2ConfigWithRuncPresent(t *testing.T) {
expectedBinaries := []string{
runcBinary,
"/test/runtime/dir/nvidia-container-runtime",
"/test/runtime/dir/nvidia-container-runtime-experimental",
"/test/runtime/dir/nvidia-container-runtime.experimental",
}
testCases := []struct {
@@ -239,7 +239,7 @@ func TestRevertV2Config(t *testing.T) {
"containerd": map[string]interface{}{
"runtimes": map[string]interface{}{
"nvidia": runtimeMapV2("/test/runtime/dir/nvidia-container-runtime"),
"nvidia-experimental": runtimeMapV2("/test/runtime/dir/nvidia-container-runtime-experimental"),
"nvidia-experimental": runtimeMapV2("/test/runtime/dir/nvidia-container-runtime.experimental"),
},
},
},
@@ -254,7 +254,7 @@ func TestRevertV2Config(t *testing.T) {
"containerd": map[string]interface{}{
"runtimes": map[string]interface{}{
"nvidia": runtimeMapV2("/test/runtime/dir/nvidia-container-runtime"),
"nvidia-experimental": runtimeMapV2("/test/runtime/dir/nvidia-container-runtime-experimental"),
"nvidia-experimental": runtimeMapV2("/test/runtime/dir/nvidia-container-runtime.experimental"),
},
"default_runtime_name": "nvidia",
},

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

@@ -38,7 +38,7 @@ const (
nvidiaRuntimeName = "nvidia"
nvidiaRuntimeBinary = "nvidia-container-runtime"
nvidiaExperimentalRuntimeName = "nvidia-experimental"
nvidiaExperimentalRuntimeBinary = "nvidia-container-runtime-experimental"
nvidiaExperimentalRuntimeBinary = "nvidia-container-runtime.experimental"
defaultConfig = "/etc/containerd/config.toml"
defaultSocket = "/run/containerd/containerd.sock"

14
tools/container/containerd/containerd_test.go
View File

@@ -31,7 +31,7 @@ func TestOptions(t *testing.T) {
{
expectedRuntimeBinaries: map[string]string{
"nvidia": "nvidia-container-runtime",
"nvidia-experimental": "nvidia-container-runtime-experimental",
"nvidia-experimental": "nvidia-container-runtime.experimental",
},
},
{
@@ -41,7 +41,7 @@ func TestOptions(t *testing.T) {
expectedDefaultRuntime: "nvidia",
expectedRuntimeBinaries: map[string]string{
"nvidia": "nvidia-container-runtime",
"nvidia-experimental": "nvidia-container-runtime-experimental",
"nvidia-experimental": "nvidia-container-runtime.experimental",
},
},
{
@@ -52,7 +52,7 @@ func TestOptions(t *testing.T) {
expectedDefaultRuntime: "nvidia",
expectedRuntimeBinaries: map[string]string{
"nvidia": "nvidia-container-runtime",
"nvidia-experimental": "nvidia-container-runtime-experimental",
"nvidia-experimental": "nvidia-container-runtime.experimental",
},
},
{
@@ -63,7 +63,7 @@ func TestOptions(t *testing.T) {
expectedDefaultRuntime: "NAME",
expectedRuntimeBinaries: map[string]string{
"NAME": "nvidia-container-runtime",
"nvidia-experimental": "nvidia-container-runtime-experimental",
"nvidia-experimental": "nvidia-container-runtime.experimental",
},
},
{
@@ -73,7 +73,7 @@ func TestOptions(t *testing.T) {
},
expectedRuntimeBinaries: map[string]string{
"NAME": "nvidia-container-runtime",
"nvidia-experimental": "nvidia-container-runtime-experimental",
"nvidia-experimental": "nvidia-container-runtime.experimental",
},
},
{
@@ -84,7 +84,7 @@ func TestOptions(t *testing.T) {
expectedDefaultRuntime: "nvidia-experimental",
expectedRuntimeBinaries: map[string]string{
"nvidia": "nvidia-container-runtime",
"nvidia-experimental": "nvidia-container-runtime-experimental",
"nvidia-experimental": "nvidia-container-runtime.experimental",
},
},
{
@@ -94,7 +94,7 @@ func TestOptions(t *testing.T) {
},
expectedRuntimeBinaries: map[string]string{
"nvidia": "nvidia-container-runtime",
"nvidia-experimental": "nvidia-container-runtime-experimental",
"nvidia-experimental": "nvidia-container-runtime.experimental",
},
},
}