diff --git a/internal/config/cli.go b/api/config/v1/cli.go similarity index 100% rename from internal/config/cli.go rename to api/config/v1/cli.go diff --git a/internal/config/cli_test.go b/api/config/v1/cli_test.go similarity index 100% rename from internal/config/cli_test.go rename to api/config/v1/cli_test.go diff --git a/internal/config/config.go b/api/config/v1/config.go similarity index 99% rename from internal/config/config.go rename to api/config/v1/config.go index 26ff3bea2..a1316b939 100644 --- a/internal/config/config.go +++ b/api/config/v1/config.go @@ -27,7 +27,7 @@ import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) const ( diff --git a/internal/config/config_test.go b/api/config/v1/config_test.go similarity index 100% rename from internal/config/config_test.go rename to api/config/v1/config_test.go diff --git a/internal/config/features.go b/api/config/v1/features.go similarity index 100% rename from internal/config/features.go rename to api/config/v1/features.go diff --git a/internal/config/hook.go b/api/config/v1/hook.go similarity index 100% rename from internal/config/hook.go rename to api/config/v1/hook.go diff --git a/internal/config/runtime.go b/api/config/v1/runtime.go similarity index 100% rename from internal/config/runtime.go rename to api/config/v1/runtime.go diff --git a/internal/config/toml.go b/api/config/v1/toml.go similarity index 100% rename from internal/config/toml.go rename to api/config/v1/toml.go diff --git a/internal/config/toml_test.go b/api/config/v1/toml_test.go similarity index 100% rename from internal/config/toml_test.go rename to api/config/v1/toml_test.go diff --git a/internal/config/toolkit-cli.go b/api/config/v1/toolkit-cli.go similarity index 100% rename from internal/config/toolkit-cli.go rename to api/config/v1/toolkit-cli.go diff --git a/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks.go b/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks.go index 82326a2f1..6682a5eac 100644 --- a/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks.go +++ b/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks.go @@ -28,8 +28,8 @@ import ( "github.com/urfave/cli/v3" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/symlinks" "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup/symlinks" ) type command struct { diff --git a/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks_test.go b/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks_test.go index f2bdefcf4..91679fd92 100644 --- a/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks_test.go +++ b/cmd/nvidia-cdi-hook/create-symlinks/create-symlinks_test.go @@ -9,7 +9,7 @@ import ( testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/symlinks" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup/symlinks" ) func TestLinkExist(t *testing.T) { diff --git a/cmd/nvidia-container-runtime-hook/container_config_test.go b/cmd/nvidia-container-runtime-hook/container_config_test.go index ed70c0d9f..3925d3dad 100644 --- a/cmd/nvidia-container-runtime-hook/container_config_test.go +++ b/cmd/nvidia-container-runtime-hook/container_config_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" ) diff --git a/cmd/nvidia-container-runtime-hook/hook_config.go b/cmd/nvidia-container-runtime-hook/hook_config.go index 2a82c5d1c..e2234012f 100644 --- a/cmd/nvidia-container-runtime-hook/hook_config.go +++ b/cmd/nvidia-container-runtime-hook/hook_config.go @@ -7,7 +7,7 @@ import ( "reflect" "sync" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" "github.com/NVIDIA/nvidia-container-toolkit/internal/info" ) diff --git a/cmd/nvidia-container-runtime-hook/main.go b/cmd/nvidia-container-runtime-hook/main.go index 7cdb0ad83..b95b6a8dd 100644 --- a/cmd/nvidia-container-runtime-hook/main.go +++ b/cmd/nvidia-container-runtime-hook/main.go @@ -13,10 +13,10 @@ import ( "strings" "syscall" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/info" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) var ( diff --git a/cmd/nvidia-ctk-installer/container/runtime/crio/crio.go b/cmd/nvidia-ctk-installer/container/runtime/crio/crio.go index 1ba08ecc6..a388815b8 100644 --- a/cmd/nvidia-ctk-installer/container/runtime/crio/crio.go +++ b/cmd/nvidia-ctk-installer/container/runtime/crio/crio.go @@ -24,8 +24,8 @@ import ( log "github.com/sirupsen/logrus" cli "github.com/urfave/cli/v3" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine" "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/crio" diff --git a/cmd/nvidia-ctk-installer/main.go b/cmd/nvidia-ctk-installer/main.go index 7643cc8b9..f54bad103 100644 --- a/cmd/nvidia-ctk-installer/main.go +++ b/cmd/nvidia-ctk-installer/main.go @@ -18,7 +18,7 @@ import ( "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/toolkit" "github.com/NVIDIA/nvidia-container-toolkit/internal/info" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) const ( diff --git a/cmd/nvidia-ctk-installer/toolkit/installer/artifact-root.go b/cmd/nvidia-ctk-installer/toolkit/installer/artifact-root.go index 349f35184..708f5cccb 100644 --- a/cmd/nvidia-ctk-installer/toolkit/installer/artifact-root.go +++ b/cmd/nvidia-ctk-installer/toolkit/installer/artifact-root.go @@ -22,7 +22,7 @@ import ( "path/filepath" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) // An artifactRoot is used as a source for installed artifacts. diff --git a/cmd/nvidia-ctk-installer/toolkit/installer/executables.go b/cmd/nvidia-ctk-installer/toolkit/installer/executables.go index 0bedd8511..47af73b92 100644 --- a/cmd/nvidia-ctk-installer/toolkit/installer/executables.go +++ b/cmd/nvidia-ctk-installer/toolkit/installer/executables.go @@ -27,8 +27,8 @@ import ( log "github.com/sirupsen/logrus" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/operator" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" ) type executable struct { diff --git a/cmd/nvidia-ctk-installer/toolkit/installer/installer_test.go b/cmd/nvidia-ctk-installer/toolkit/installer/installer_test.go index d308fb3c3..30697b8cd 100644 --- a/cmd/nvidia-ctk-installer/toolkit/installer/installer_test.go +++ b/cmd/nvidia-ctk-installer/toolkit/installer/installer_test.go @@ -29,7 +29,7 @@ import ( testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) func TestToolkitInstaller(t *testing.T) { diff --git a/cmd/nvidia-ctk-installer/toolkit/toolkit.go b/cmd/nvidia-ctk-installer/toolkit/toolkit.go index a7937b2b1..0e845882a 100644 --- a/cmd/nvidia-ctk-installer/toolkit/toolkit.go +++ b/cmd/nvidia-ctk-installer/toolkit/toolkit.go @@ -26,13 +26,13 @@ import ( "tags.cncf.io/container-device-interface/pkg/cdi" "tags.cncf.io/container-device-interface/pkg/parser" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/runtime/crio" "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/toolkit/installer" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/system/nvdevices" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi" transformroot "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform/root" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/system/nvdevices" ) const ( diff --git a/cmd/nvidia-ctk-installer/toolkit/toolkit_test.go b/cmd/nvidia-ctk-installer/toolkit/toolkit_test.go index 5ac6be20d..616f2d220 100644 --- a/cmd/nvidia-ctk-installer/toolkit/toolkit_test.go +++ b/cmd/nvidia-ctk-installer/toolkit/toolkit_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/require" "github.com/urfave/cli/v3" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/symlinks" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/test" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup/symlinks" ) func TestInstall(t *testing.T) { diff --git a/cmd/nvidia-ctk/cdi/generate/config.go b/cmd/nvidia-ctk/cdi/generate/config.go index 0e1c016bd..de2b2a38f 100644 --- a/cmd/nvidia-ctk/cdi/generate/config.go +++ b/cmd/nvidia-ctk/cdi/generate/config.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" altsrc "github.com/urfave/cli-altsrc/v3" "github.com/urfave/cli/v3" diff --git a/cmd/nvidia-ctk/cdi/generate/generate.go b/cmd/nvidia-ctk/cdi/generate/generate.go index 8578e7259..1517e7584 100644 --- a/cmd/nvidia-ctk/cdi/generate/generate.go +++ b/cmd/nvidia-ctk/cdi/generate/generate.go @@ -32,7 +32,7 @@ import ( "github.com/NVIDIA/go-nvml/pkg/nvml" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra/csv" "github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi" diff --git a/cmd/nvidia-ctk/config/config.go b/cmd/nvidia-ctk/config/config.go index 49bcd166b..81a8d206b 100644 --- a/cmd/nvidia-ctk/config/config.go +++ b/cmd/nvidia-ctk/config/config.go @@ -26,9 +26,9 @@ import ( "github.com/urfave/cli/v3" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" createdefault "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/config/create-default" "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/config/flags" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" ) diff --git a/cmd/nvidia-ctk/config/create-default/create-default.go b/cmd/nvidia-ctk/config/create-default/create-default.go index 8225b6994..085aea4bd 100644 --- a/cmd/nvidia-ctk/config/create-default/create-default.go +++ b/cmd/nvidia-ctk/config/create-default/create-default.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/config/flags" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" ) diff --git a/cmd/nvidia-ctk/system/create-dev-char-symlinks/create-dev-char-symlinks.go b/cmd/nvidia-ctk/system/create-dev-char-symlinks/create-dev-char-symlinks.go index ecbca9a9c..349e04590 100644 --- a/cmd/nvidia-ctk/system/create-dev-char-symlinks/create-dev-char-symlinks.go +++ b/cmd/nvidia-ctk/system/create-dev-char-symlinks/create-dev-char-symlinks.go @@ -25,8 +25,8 @@ import ( "github.com/urfave/cli/v3" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/system/nvdevices" - "github.com/NVIDIA/nvidia-container-toolkit/internal/system/nvmodules" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/system/nvdevices" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/system/nvmodules" ) const ( diff --git a/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing.go b/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing.go index d022a98fe..e8d0fb586 100644 --- a/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing.go +++ b/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing.go @@ -23,7 +23,7 @@ import ( "golang.org/x/sys/unix" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) type nodeLister interface { diff --git a/cmd/nvidia-ctk/system/create-device-nodes/create-device-nodes.go b/cmd/nvidia-ctk/system/create-device-nodes/create-device-nodes.go index 73b1fb4b1..bac5923d9 100644 --- a/cmd/nvidia-ctk/system/create-device-nodes/create-device-nodes.go +++ b/cmd/nvidia-ctk/system/create-device-nodes/create-device-nodes.go @@ -23,8 +23,8 @@ import ( "github.com/urfave/cli/v3" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/system/nvdevices" - "github.com/NVIDIA/nvidia-container-toolkit/internal/system/nvmodules" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/system/nvdevices" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/system/nvmodules" ) type command struct { diff --git a/internal/discover/char_devices.go b/internal/discover/char_devices.go index 8d59430da..3abdf7ee8 100644 --- a/internal/discover/char_devices.go +++ b/internal/discover/char_devices.go @@ -18,7 +18,7 @@ package discover import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) // charDevices is a discover for a list of character devices diff --git a/internal/discover/char_devices_test.go b/internal/discover/char_devices_test.go index 022e3237d..27ff5d01b 100644 --- a/internal/discover/char_devices_test.go +++ b/internal/discover/char_devices_test.go @@ -23,7 +23,7 @@ import ( testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) func TestCharDevices(t *testing.T) { diff --git a/internal/discover/gds.go b/internal/discover/gds.go index cf762cd8a..20c8dafa4 100644 --- a/internal/discover/gds.go +++ b/internal/discover/gds.go @@ -18,7 +18,7 @@ package discover import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) type gdsDeviceDiscoverer struct { diff --git a/internal/discover/graphics.go b/internal/discover/graphics.go index afa97c67f..4f58771c1 100644 --- a/internal/discover/graphics.go +++ b/internal/discover/graphics.go @@ -27,8 +27,8 @@ import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/info/drm" "github.com/NVIDIA/nvidia-container-toolkit/internal/info/proc" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/root" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) // NewDRMNodesDiscoverer returns a discoverer for the DRM device nodes associated with the specified visible devices. diff --git a/internal/discover/ipc.go b/internal/discover/ipc.go index 0c8734c39..3a5611044 100644 --- a/internal/discover/ipc.go +++ b/internal/discover/ipc.go @@ -18,7 +18,7 @@ package discover import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) // ipcMountOptions defines the mount options for IPC sockets. diff --git a/internal/discover/ipc_test.go b/internal/discover/ipc_test.go index e51901da8..a552ad09d 100644 --- a/internal/discover/ipc_test.go +++ b/internal/discover/ipc_test.go @@ -22,7 +22,7 @@ import ( testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) func TestIPCMounts(t *testing.T) { diff --git a/internal/discover/mounts-to-container-path.go b/internal/discover/mounts-to-container-path.go index d92bc91cc..2a37f8e92 100644 --- a/internal/discover/mounts-to-container-path.go +++ b/internal/discover/mounts-to-container-path.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) // mountsToContainerPath defines a Discoverer for a required set of mounts. diff --git a/internal/discover/mounts-to-container-path_test.go b/internal/discover/mounts-to-container-path_test.go index dd4a17d10..e09e84225 100644 --- a/internal/discover/mounts-to-container-path_test.go +++ b/internal/discover/mounts-to-container-path_test.go @@ -23,7 +23,7 @@ import ( testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) func TestMountsToContainerPath(t *testing.T) { diff --git a/internal/discover/mounts.go b/internal/discover/mounts.go index 7eb41a384..0f39f55a7 100644 --- a/internal/discover/mounts.go +++ b/internal/discover/mounts.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) // mounts is a generic discoverer for Mounts. It is customized by specifying the diff --git a/internal/discover/mounts_test.go b/internal/discover/mounts_test.go index 2a8d54289..b48c2612d 100644 --- a/internal/discover/mounts_test.go +++ b/internal/discover/mounts_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" testlog "github.com/sirupsen/logrus/hooks/test" ) diff --git a/internal/ldconfig/ldconfig.go b/internal/ldconfig/ldconfig.go index 21ed2970c..c761efc42 100644 --- a/internal/ldconfig/ldconfig.go +++ b/internal/ldconfig/ldconfig.go @@ -30,7 +30,7 @@ import ( "github.com/prometheus/procfs" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" ) const ( diff --git a/internal/lookup/root/cuda_test.go b/internal/lookup/root/cuda_test.go index e26361c7c..4f548238f 100644 --- a/internal/lookup/root/cuda_test.go +++ b/internal/lookup/root/cuda_test.go @@ -26,7 +26,7 @@ import ( testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) func TestLocate(t *testing.T) { diff --git a/internal/lookup/root/root.go b/internal/lookup/root/root.go index 0f15e2e0f..a0c9ae31e 100644 --- a/internal/lookup/root/root.go +++ b/internal/lookup/root/root.go @@ -25,7 +25,7 @@ import ( "sync" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) // Driver represents a filesystem in which a set of drivers or devices is defined. diff --git a/internal/lookup/root/root_test.go b/internal/lookup/root/root_test.go index c256deb69..6f7b9fc31 100644 --- a/internal/lookup/root/root_test.go +++ b/internal/lookup/root/root_test.go @@ -23,8 +23,8 @@ import ( testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" "github.com/NVIDIA/nvidia-container-toolkit/internal/test" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) func TestDriverLibrariesLocate(t *testing.T) { diff --git a/internal/modifier/cdi.go b/internal/modifier/cdi.go index 2bba668d9..4ddbb207c 100644 --- a/internal/modifier/cdi.go +++ b/internal/modifier/cdi.go @@ -22,7 +22,7 @@ import ( "tags.cncf.io/container-device-interface/pkg/parser" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/modifier/cdi" diff --git a/internal/modifier/csv.go b/internal/modifier/csv.go index c8cf4ead3..2d3c372ff 100644 --- a/internal/modifier/csv.go +++ b/internal/modifier/csv.go @@ -19,7 +19,7 @@ package modifier import ( "fmt" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" "github.com/NVIDIA/nvidia-container-toolkit/internal/cuda" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" diff --git a/internal/modifier/csv_test.go b/internal/modifier/csv_test.go index cdd41ce70..0f6d055b4 100644 --- a/internal/modifier/csv_test.go +++ b/internal/modifier/csv_test.go @@ -22,7 +22,7 @@ import ( testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" ) diff --git a/internal/modifier/gated.go b/internal/modifier/gated.go index 84b01ee4b..369a22085 100644 --- a/internal/modifier/gated.go +++ b/internal/modifier/gated.go @@ -19,7 +19,7 @@ package modifier import ( "fmt" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" diff --git a/internal/modifier/graphics.go b/internal/modifier/graphics.go index cd024a892..54e105637 100644 --- a/internal/modifier/graphics.go +++ b/internal/modifier/graphics.go @@ -19,7 +19,7 @@ package modifier import ( "fmt" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" diff --git a/internal/modifier/hook_remover.go b/internal/modifier/hook_remover.go index 24cf76662..4f186bec0 100644 --- a/internal/modifier/hook_remover.go +++ b/internal/modifier/hook_remover.go @@ -21,7 +21,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" ) diff --git a/internal/oci/runtime_low_level.go b/internal/oci/runtime_low_level.go index 65ae8b212..041a83011 100644 --- a/internal/oci/runtime_low_level.go +++ b/internal/oci/runtime_low_level.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) // NewLowLevelRuntime creates a Runtime that wraps a low-level runtime executable. diff --git a/internal/platform-support/tegra/csv.go b/internal/platform-support/tegra/csv.go index a6507e0c7..235011224 100644 --- a/internal/platform-support/tegra/csv.go +++ b/internal/platform-support/tegra/csv.go @@ -21,8 +21,8 @@ import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" "github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra/csv" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) // newDiscovererFromMountSpecs creates a discoverer for the specified mount specs. diff --git a/internal/platform-support/tegra/csv_test.go b/internal/platform-support/tegra/csv_test.go index 7f41227f1..6e3bbedce 100644 --- a/internal/platform-support/tegra/csv_test.go +++ b/internal/platform-support/tegra/csv_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) func TestDiscovererFromCSVFiles(t *testing.T) { diff --git a/internal/platform-support/tegra/options.go b/internal/platform-support/tegra/options.go index fdc8ee577..6e18a8cd7 100644 --- a/internal/platform-support/tegra/options.go +++ b/internal/platform-support/tegra/options.go @@ -20,7 +20,7 @@ package tegra import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) type options struct { diff --git a/internal/platform-support/tegra/symlinks.go b/internal/platform-support/tegra/symlinks.go index 00e664a19..272fffc67 100644 --- a/internal/platform-support/tegra/symlinks.go +++ b/internal/platform-support/tegra/symlinks.go @@ -21,7 +21,7 @@ import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) type symlinkHook struct { diff --git a/internal/platform-support/tegra/tegra.go b/internal/platform-support/tegra/tegra.go index 982bdad3b..f21e9b284 100644 --- a/internal/platform-support/tegra/tegra.go +++ b/internal/platform-support/tegra/tegra.go @@ -20,8 +20,8 @@ import ( "fmt" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/symlinks" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup/symlinks" ) // New creates a new tegra discoverer using the supplied functional options. diff --git a/internal/runtime/runtime.go b/internal/runtime/runtime.go index 7123fefab..56674d3d5 100644 --- a/internal/runtime/runtime.go +++ b/internal/runtime/runtime.go @@ -23,7 +23,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/info" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/root" diff --git a/internal/runtime/runtime_factory.go b/internal/runtime/runtime_factory.go index fc8fd7641..8397fe542 100644 --- a/internal/runtime/runtime_factory.go +++ b/internal/runtime/runtime_factory.go @@ -19,7 +19,7 @@ package runtime import ( "fmt" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/info" diff --git a/internal/runtime/runtime_factory_test.go b/internal/runtime/runtime_factory_test.go index 8eee529eb..d8e4efe1d 100644 --- a/internal/runtime/runtime_factory_test.go +++ b/internal/runtime/runtime_factory_test.go @@ -28,7 +28,7 @@ import ( testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config" + "github.com/NVIDIA/nvidia-container-toolkit/api/config/v1" "github.com/NVIDIA/nvidia-container-toolkit/internal/config/image" "github.com/NVIDIA/nvidia-container-toolkit/internal/info" "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/root" diff --git a/internal/lookup/device.go b/pkg/lookup/device.go similarity index 100% rename from internal/lookup/device.go rename to pkg/lookup/device.go diff --git a/internal/lookup/device_test.go b/pkg/lookup/device_test.go similarity index 100% rename from internal/lookup/device_test.go rename to pkg/lookup/device_test.go diff --git a/internal/lookup/dir.go b/pkg/lookup/dir.go similarity index 100% rename from internal/lookup/dir.go rename to pkg/lookup/dir.go diff --git a/internal/lookup/executable.go b/pkg/lookup/executable.go similarity index 100% rename from internal/lookup/executable.go rename to pkg/lookup/executable.go diff --git a/internal/lookup/executable_test.go b/pkg/lookup/executable_test.go similarity index 100% rename from internal/lookup/executable_test.go rename to pkg/lookup/executable_test.go diff --git a/internal/lookup/file.go b/pkg/lookup/file.go similarity index 100% rename from internal/lookup/file.go rename to pkg/lookup/file.go diff --git a/internal/lookup/file_test.go b/pkg/lookup/file_test.go similarity index 100% rename from internal/lookup/file_test.go rename to pkg/lookup/file_test.go diff --git a/internal/lookup/ldcache.go b/pkg/lookup/ldcache.go similarity index 100% rename from internal/lookup/ldcache.go rename to pkg/lookup/ldcache.go diff --git a/internal/lookup/ldcache_test.go b/pkg/lookup/ldcache_test.go similarity index 100% rename from internal/lookup/ldcache_test.go rename to pkg/lookup/ldcache_test.go diff --git a/internal/lookup/library.go b/pkg/lookup/library.go similarity index 100% rename from internal/lookup/library.go rename to pkg/lookup/library.go diff --git a/internal/lookup/library_test.go b/pkg/lookup/library_test.go similarity index 100% rename from internal/lookup/library_test.go rename to pkg/lookup/library_test.go diff --git a/internal/lookup/locator.go b/pkg/lookup/locator.go similarity index 100% rename from internal/lookup/locator.go rename to pkg/lookup/locator.go diff --git a/internal/lookup/locator_mock.go b/pkg/lookup/locator_mock.go similarity index 100% rename from internal/lookup/locator_mock.go rename to pkg/lookup/locator_mock.go diff --git a/internal/lookup/merge.go b/pkg/lookup/merge.go similarity index 100% rename from internal/lookup/merge.go rename to pkg/lookup/merge.go diff --git a/internal/lookup/null.go b/pkg/lookup/null.go similarity index 100% rename from internal/lookup/null.go rename to pkg/lookup/null.go diff --git a/internal/lookup/path.go b/pkg/lookup/path.go similarity index 100% rename from internal/lookup/path.go rename to pkg/lookup/path.go diff --git a/internal/lookup/symlinks.go b/pkg/lookup/symlinks.go similarity index 97% rename from internal/lookup/symlinks.go rename to pkg/lookup/symlinks.go index c9bab069d..1fe47d5bd 100644 --- a/internal/lookup/symlinks.go +++ b/pkg/lookup/symlinks.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/symlinks" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup/symlinks" ) type symlinkChain struct { diff --git a/internal/lookup/symlinks/symlink.go b/pkg/lookup/symlinks/symlink.go similarity index 100% rename from internal/lookup/symlinks/symlink.go rename to pkg/lookup/symlinks/symlink.go diff --git a/pkg/nvcdi/driver-nvml.go b/pkg/nvcdi/driver-nvml.go index 168275993..c48ab929b 100644 --- a/pkg/nvcdi/driver-nvml.go +++ b/pkg/nvcdi/driver-nvml.go @@ -26,8 +26,8 @@ import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/root" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) // NewDriverDiscoverer creates a discoverer for the libraries and binaries associated with a driver installation. diff --git a/pkg/nvcdi/driver-wsl.go b/pkg/nvcdi/driver-wsl.go index 041c27cee..47af6c3f1 100644 --- a/pkg/nvcdi/driver-wsl.go +++ b/pkg/nvcdi/driver-wsl.go @@ -23,7 +23,7 @@ import ( "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/dxcore" "github.com/NVIDIA/nvidia-container-toolkit/internal/logger" - "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/lookup" ) var requiredDriverStoreFiles = []string{ diff --git a/internal/system/nvdevices/devices.go b/pkg/system/nvdevices/devices.go similarity index 100% rename from internal/system/nvdevices/devices.go rename to pkg/system/nvdevices/devices.go diff --git a/internal/system/nvdevices/devices_test.go b/pkg/system/nvdevices/devices_test.go similarity index 100% rename from internal/system/nvdevices/devices_test.go rename to pkg/system/nvdevices/devices_test.go diff --git a/internal/system/nvdevices/mknod.go b/pkg/system/nvdevices/mknod.go similarity index 100% rename from internal/system/nvdevices/mknod.go rename to pkg/system/nvdevices/mknod.go diff --git a/internal/system/nvdevices/mknod_mock.go b/pkg/system/nvdevices/mknod_mock.go similarity index 100% rename from internal/system/nvdevices/mknod_mock.go rename to pkg/system/nvdevices/mknod_mock.go diff --git a/internal/system/nvdevices/options.go b/pkg/system/nvdevices/options.go similarity index 100% rename from internal/system/nvdevices/options.go rename to pkg/system/nvdevices/options.go diff --git a/internal/system/nvmodules/cmd.go b/pkg/system/nvmodules/cmd.go similarity index 100% rename from internal/system/nvmodules/cmd.go rename to pkg/system/nvmodules/cmd.go diff --git a/internal/system/nvmodules/cmd_mock.go b/pkg/system/nvmodules/cmd_mock.go similarity index 100% rename from internal/system/nvmodules/cmd_mock.go rename to pkg/system/nvmodules/cmd_mock.go diff --git a/internal/system/nvmodules/modules.go b/pkg/system/nvmodules/modules.go similarity index 100% rename from internal/system/nvmodules/modules.go rename to pkg/system/nvmodules/modules.go diff --git a/internal/system/nvmodules/modules_test.go b/pkg/system/nvmodules/modules_test.go similarity index 100% rename from internal/system/nvmodules/modules_test.go rename to pkg/system/nvmodules/modules_test.go diff --git a/internal/system/nvmodules/options.go b/pkg/system/nvmodules/options.go similarity index 100% rename from internal/system/nvmodules/options.go rename to pkg/system/nvmodules/options.go