UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-02-16 17:42:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'engine_export' into 'main'

Browse Source 
Export pkg config/engine

See merge request nvidia/container-toolkit/container-toolkit!375
This commit is contained in:
Carlos Eduardo Arango Gutierrez 2023-04-25 05:17:20 +00:00
commit 3030d281d9
17 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/nvidia-ctk/runtime/configure/configure.go
View File

@ -20,10 +20,10 @@ import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/containerd" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/containerd"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/crio" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/crio"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/docker" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/docker"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

0
internal/config/engine/api.go → pkg/config/engine/api.go
View File

2
internal/config/engine/containerd/config_v1.go → pkg/config/engine/containerd/config_v1.go
View File

@ -19,7 +19,7 @@ package containerd
import ( import (
"fmt" "fmt"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
"github.com/pelletier/go-toml" "github.com/pelletier/go-toml"
) )

0
internal/config/engine/containerd/config_v2.go → pkg/config/engine/containerd/config_v2.go
View File

2
internal/config/engine/containerd/containerd.go → pkg/config/engine/containerd/containerd.go
View File

@ -17,7 +17,7 @@
package containerd package containerd
import ( import (
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
"github.com/pelletier/go-toml" "github.com/pelletier/go-toml"
) )

2
internal/config/engine/containerd/option.go → pkg/config/engine/containerd/option.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
"github.com/pelletier/go-toml" "github.com/pelletier/go-toml"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

2
internal/config/engine/crio/crio.go → pkg/config/engine/crio/crio.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
"github.com/pelletier/go-toml" "github.com/pelletier/go-toml"
) )

0
internal/config/engine/crio/option.go → pkg/config/engine/crio/option.go
View File

2
internal/config/engine/docker/docker.go → pkg/config/engine/docker/docker.go
View File

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
) )
const ( const (

0
internal/config/engine/docker/docker_test.go → pkg/config/engine/docker/docker_test.go
View File

0
internal/config/engine/docker/option.go → pkg/config/engine/docker/option.go
View File

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

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/containerd" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/containerd"
"github.com/pelletier/go-toml" "github.com/pelletier/go-toml"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/containerd" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/containerd"
"github.com/pelletier/go-toml" "github.com/pelletier/go-toml"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

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

@ -24,8 +24,8 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/containerd" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/containerd"
"github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator" "github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
cli "github.com/urfave/cli/v2" cli "github.com/urfave/cli/v2"

4
tools/container/crio/crio.go
View File

@ -24,8 +24,8 @@ import (
"path/filepath" "path/filepath"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config" "github.com/NVIDIA/nvidia-container-toolkit/internal/config"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/crio" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/crio"
"github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator" "github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
cli "github.com/urfave/cli/v2" cli "github.com/urfave/cli/v2"

4
tools/container/docker/docker.go
View File

@ -23,8 +23,8 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/docker" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/docker"
"github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator" "github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
cli "github.com/urfave/cli/v2" cli "github.com/urfave/cli/v2"

2
tools/container/docker/docker_test.go
View File

@ -20,7 +20,7 @@ import (
"encoding/json" "encoding/json"
"testing" "testing"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/docker" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/docker"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )