Skip to content

Commit 255d550

Browse files
committed
[no-relnote] Move tools/container to cmd/nvidia-ctk-installer
Signed-off-by: Evan Lezar <[email protected]>
1 parent c0e4de7 commit 255d550

26 files changed

+14
-14
lines changed

tools/container/container.go renamed to cmd/nvidia-ctk-installer/container/container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/sirupsen/logrus"
2525
"github.com/urfave/cli/v2"
2626

27+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/operator"
2728
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
28-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator"
2929
)
3030

3131
const (

tools/container/runtime/containerd/config_v1_test.go renamed to cmd/nvidia-ctk-installer/container/runtime/containerd/config_v1_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
testlog "github.com/sirupsen/logrus/hooks/test"
2424
"github.com/stretchr/testify/require"
2525

26+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container"
2627
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/containerd"
2728
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/toml"
28-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container"
2929
)
3030

3131
func TestUpdateV1ConfigDefaultRuntime(t *testing.T) {

tools/container/runtime/containerd/config_v2_test.go renamed to cmd/nvidia-ctk-installer/container/runtime/containerd/config_v2_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
testlog "github.com/sirupsen/logrus/hooks/test"
2424
"github.com/stretchr/testify/require"
2525

26+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container"
2627
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/containerd"
2728
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/toml"
28-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container"
2929
)
3030

3131
const (

tools/container/runtime/containerd/containerd.go renamed to cmd/nvidia-ctk-installer/container/runtime/containerd/containerd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
log "github.com/sirupsen/logrus"
2424
cli "github.com/urfave/cli/v2"
2525

26+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container"
2627
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
2728
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/containerd"
2829
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/toml"
29-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container"
3030
)
3131

3232
const (

tools/container/runtime/crio/crio.go renamed to cmd/nvidia-ctk-installer/container/runtime/crio/crio.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import (
2424
log "github.com/sirupsen/logrus"
2525
cli "github.com/urfave/cli/v2"
2626

27+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container"
2728
"github.com/NVIDIA/nvidia-container-toolkit/internal/config"
2829
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
2930
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/crio"
3031
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/ocihook"
3132
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/toml"
32-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container"
3333
)
3434

3535
const (

tools/container/runtime/docker/docker.go renamed to cmd/nvidia-ctk-installer/container/runtime/docker/docker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
log "github.com/sirupsen/logrus"
2323
cli "github.com/urfave/cli/v2"
2424

25+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container"
2526
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
2627
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/docker"
27-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container"
2828
)
2929

3030
const (

tools/container/runtime/docker/docker_test.go renamed to cmd/nvidia-ctk-installer/container/runtime/docker/docker_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"github.com/stretchr/testify/require"
2424

25+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container"
2526
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine/docker"
26-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container"
2727
)
2828

2929
func TestUpdateConfigDefaultRuntime(t *testing.T) {

tools/container/runtime/runtime.go renamed to cmd/nvidia-ctk-installer/container/runtime/runtime.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121

2222
"github.com/urfave/cli/v2"
2323

24-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container"
25-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container/runtime/containerd"
26-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container/runtime/crio"
27-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container/runtime/docker"
24+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container"
25+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/runtime/containerd"
26+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/runtime/crio"
27+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/runtime/docker"
2828
)
2929

3030
const (

tools/container/toolkit/runtime.go renamed to cmd/nvidia-ctk-installer/container/toolkit/runtime.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"path/filepath"
2222

23-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container/operator"
23+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/operator"
2424
)
2525

2626
const (

cmd/nvidia-ctk-installer/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"github.com/urfave/cli/v2"
1212
"golang.org/x/sys/unix"
1313

14+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/runtime"
15+
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/toolkit"
1416
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
15-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container/runtime"
16-
"github.com/NVIDIA/nvidia-container-toolkit/tools/container/toolkit"
1717
)
1818

1919
const (

0 commit comments

Comments
 (0)