From e5bb4d27183cf379fa6add30753101af6c0d52f9 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 27 Feb 2023 13:52:11 +0200 Subject: [PATCH] Move runtime config code from config to config/engine Signed-off-by: Evan Lezar --- cmd/nvidia-ctk/runtime/configure/configure.go | 4 ++-- internal/config/{ => engine}/crio/crio.go | 0 internal/config/{ => engine}/docker/docker.go | 0 internal/config/{ => engine}/docker/docker_test.go | 0 tools/container/crio/crio.go | 2 +- tools/container/docker/docker.go | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename internal/config/{ => engine}/crio/crio.go (100%) rename internal/config/{ => engine}/docker/docker.go (100%) rename internal/config/{ => engine}/docker/docker_test.go (100%) diff --git a/cmd/nvidia-ctk/runtime/configure/configure.go b/cmd/nvidia-ctk/runtime/configure/configure.go index a0d66afc..1b2decd8 100644 --- a/cmd/nvidia-ctk/runtime/configure/configure.go +++ b/cmd/nvidia-ctk/runtime/configure/configure.go @@ -22,8 +22,8 @@ import ( "os" "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/runtime/nvidia" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/crio" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/docker" + "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/crio" + "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/docker" "github.com/pelletier/go-toml" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" diff --git a/internal/config/crio/crio.go b/internal/config/engine/crio/crio.go similarity index 100% rename from internal/config/crio/crio.go rename to internal/config/engine/crio/crio.go diff --git a/internal/config/docker/docker.go b/internal/config/engine/docker/docker.go similarity index 100% rename from internal/config/docker/docker.go rename to internal/config/engine/docker/docker.go diff --git a/internal/config/docker/docker_test.go b/internal/config/engine/docker/docker_test.go similarity index 100% rename from internal/config/docker/docker_test.go rename to internal/config/engine/docker/docker_test.go diff --git a/tools/container/crio/crio.go b/tools/container/crio/crio.go index daf5ec39..d415388c 100644 --- a/tools/container/crio/crio.go +++ b/tools/container/crio/crio.go @@ -24,7 +24,7 @@ import ( "path/filepath" "github.com/NVIDIA/nvidia-container-toolkit/internal/config" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/crio" + "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/crio" "github.com/pelletier/go-toml" 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 92949b20..89621a18 100644 --- a/tools/container/docker/docker.go +++ b/tools/container/docker/docker.go @@ -24,7 +24,7 @@ import ( "syscall" "time" - "github.com/NVIDIA/nvidia-container-toolkit/internal/config/docker" + "github.com/NVIDIA/nvidia-container-toolkit/internal/config/engine/docker" log "github.com/sirupsen/logrus" cli "github.com/urfave/cli/v2" )