diff --git a/cmd/nvidia-ctk/runtime/configure/configure.go b/cmd/nvidia-ctk/runtime/configure/configure.go index bcc41953..d9085d45 100644 --- a/cmd/nvidia-ctk/runtime/configure/configure.go +++ b/cmd/nvidia-ctk/runtime/configure/configure.go @@ -20,10 +20,10 @@ import ( "fmt" "path/filepath" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/containerd" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/crio" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/docker" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/containerd" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/crio" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/docker" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) diff --git a/internal/config/engine/api.go b/pkg/config/engine/api.go similarity index 100% rename from internal/config/engine/api.go rename to pkg/config/engine/api.go diff --git a/internal/config/engine/containerd/config_v1.go b/pkg/config/engine/containerd/config_v1.go similarity index 98% rename from internal/config/engine/containerd/config_v1.go rename to pkg/config/engine/containerd/config_v1.go index a470a581..b432f60b 100644 --- a/internal/config/engine/containerd/config_v1.go +++ b/pkg/config/engine/containerd/config_v1.go @@ -19,7 +19,7 @@ package containerd import ( "fmt" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine" "github.com/pelletier/go-toml" ) diff --git a/internal/config/engine/containerd/config_v2.go b/pkg/config/engine/containerd/config_v2.go similarity index 100% rename from internal/config/engine/containerd/config_v2.go rename to pkg/config/engine/containerd/config_v2.go diff --git a/internal/config/engine/containerd/containerd.go b/pkg/config/engine/containerd/containerd.go similarity index 93% rename from internal/config/engine/containerd/containerd.go rename to pkg/config/engine/containerd/containerd.go index e163c41d..ab782ca6 100644 --- a/internal/config/engine/containerd/containerd.go +++ b/pkg/config/engine/containerd/containerd.go @@ -17,7 +17,7 @@ package containerd import ( - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine" "github.com/pelletier/go-toml" ) diff --git a/internal/config/engine/containerd/option.go b/pkg/config/engine/containerd/option.go similarity index 98% rename from internal/config/engine/containerd/option.go rename to pkg/config/engine/containerd/option.go index 92f2073d..400d5925 100644 --- a/internal/config/engine/containerd/option.go +++ b/pkg/config/engine/containerd/option.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine" "github.com/pelletier/go-toml" log "github.com/sirupsen/logrus" ) diff --git a/internal/config/engine/crio/crio.go b/pkg/config/engine/crio/crio.go similarity index 98% rename from internal/config/engine/crio/crio.go rename to pkg/config/engine/crio/crio.go index c9b72af7..dda5c451 100644 --- a/internal/config/engine/crio/crio.go +++ b/pkg/config/engine/crio/crio.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine" "github.com/pelletier/go-toml" ) diff --git a/internal/config/engine/crio/option.go b/pkg/config/engine/crio/option.go similarity index 100% rename from internal/config/engine/crio/option.go rename to pkg/config/engine/crio/option.go diff --git a/internal/config/engine/docker/docker.go b/pkg/config/engine/docker/docker.go similarity index 97% rename from internal/config/engine/docker/docker.go rename to pkg/config/engine/docker/docker.go index 12130f53..260be267 100644 --- a/internal/config/engine/docker/docker.go +++ b/pkg/config/engine/docker/docker.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine" ) const ( diff --git a/internal/config/engine/docker/docker_test.go b/pkg/config/engine/docker/docker_test.go similarity index 100% rename from internal/config/engine/docker/docker_test.go rename to pkg/config/engine/docker/docker_test.go diff --git a/internal/config/engine/docker/option.go b/pkg/config/engine/docker/option.go similarity index 100% rename from internal/config/engine/docker/option.go rename to pkg/config/engine/docker/option.go diff --git a/tools/container/containerd/config_v1_test.go b/tools/container/containerd/config_v1_test.go index 9625d90b..ebe6a148 100644 --- a/tools/container/containerd/config_v1_test.go +++ b/tools/container/containerd/config_v1_test.go @@ -20,7 +20,7 @@ import ( "fmt" "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/stretchr/testify/require" ) diff --git a/tools/container/containerd/config_v2_test.go b/tools/container/containerd/config_v2_test.go index c14fb58f..ad2b91f9 100644 --- a/tools/container/containerd/config_v2_test.go +++ b/tools/container/containerd/config_v2_test.go @@ -20,7 +20,7 @@ import ( "fmt" "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/stretchr/testify/require" ) diff --git a/tools/container/containerd/containerd.go b/tools/container/containerd/containerd.go index 011a27d9..e5252e8c 100644 --- a/tools/container/containerd/containerd.go +++ b/tools/container/containerd/containerd.go @@ -24,8 +24,8 @@ import ( "syscall" "time" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/containerd" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/containerd" "github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator" log "github.com/sirupsen/logrus" cli "github.com/urfave/cli/v2" diff --git a/tools/container/crio/crio.go b/tools/container/crio/crio.go index 233a26fc..e0c7b87b 100644 --- a/tools/container/crio/crio.go +++ b/tools/container/crio/crio.go @@ -24,8 +24,8 @@ import ( "path/filepath" "github.com/NVIDIA/nvidia-container-toolkit/internal/config" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/crio" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/crio" "github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator" log "github.com/sirupsen/logrus" cli "github.com/urfave/cli/v2" diff --git a/tools/container/docker/docker.go b/tools/container/docker/docker.go index 57704e3e..8f9747a4 100644 --- a/tools/container/docker/docker.go +++ b/tools/container/docker/docker.go @@ -23,8 +23,8 @@ import ( "syscall" "time" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/docker" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine" + "github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/docker" "github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator" log "github.com/sirupsen/logrus" cli "github.com/urfave/cli/v2" diff --git a/tools/container/docker/docker_test.go b/tools/container/docker/docker_test.go index 2bba2116..eeec30ca 100644 --- a/tools/container/docker/docker_test.go +++ b/tools/container/docker/docker_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "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" )