Skip to content

Commit 3604927

Browse files
elezarelezar
committed
Replace github.com/container-orchestrated-devices/container-device-interface with tags.cncf.io
This also removes the indirect dependency on runc which has a CVE. Signed-off-by: Evan Lezar <[email protected]>
1 parent 640bd6e commit 3604927

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+446
-676
lines changed

‎cmd/nvidia-ctk/cdi/generate/generate.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25+
"github.com/urfave/cli/v2"
26+
"tags.cncf.io/container-device-interface/pkg/cdi"
27+
2528
"github.com/NVIDIA/nvidia-container-toolkit/internal/config"
2629
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
2730
"github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra/csv"
2831
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi"
2932
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
3033
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
31-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
32-
"github.com/urfave/cli/v2"
3334
)
3435

3536
const (

‎cmd/nvidia-ctk/cdi/list/list.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ package list
1919
import (
2020
"fmt"
2121

22-
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
23-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
2422
"github.com/urfave/cli/v2"
23+
"tags.cncf.io/container-device-interface/pkg/cdi"
24+
25+
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
2526
)
2627

2728
type command struct {

‎cmd/nvidia-ctk/cdi/transform/root/root.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import (
2121
"io"
2222
"os"
2323

24+
"github.com/urfave/cli/v2"
25+
"tags.cncf.io/container-device-interface/pkg/cdi"
26+
2427
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
2528
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/spec"
2629
"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
27-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
28-
"github.com/urfave/cli/v2"
2930
)
3031

3132
type loadSaver interface {

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ go 1.20
44

55
require (
66
github.com/NVIDIA/go-nvml v0.12.0-1
7-
github.com/container-orchestrated-devices/container-device-interface v0.6.0
87
github.com/fsnotify/fsnotify v1.5.4
9-
github.com/opencontainers/runtime-spec v1.1.0-rc.2
8+
github.com/opencontainers/runtime-spec v1.1.0
109
github.com/pelletier/go-toml v1.9.4
1110
github.com/sirupsen/logrus v1.9.0
1211
github.com/stretchr/testify v1.8.1
1312
github.com/urfave/cli/v2 v2.3.0
1413
gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230818092907-09424fdc8884
1514
golang.org/x/mod v0.5.0
1615
golang.org/x/sys v0.7.0
16+
tags.cncf.io/container-device-interface v0.6.2
17+
tags.cncf.io/container-device-interface/specs-go v0.6.0
1718
)
1819

1920
require (
2021
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
2122
github.com/davecgh/go-spew v1.1.1 // indirect
2223
github.com/hashicorp/errwrap v1.1.0 // indirect
2324
github.com/kr/pretty v0.3.1 // indirect
24-
github.com/opencontainers/runc v1.1.6 // indirect
2525
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
2626
github.com/opencontainers/selinux v1.11.0 // indirect
2727
github.com/pmezard/go-difflib v1.0.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ github.com/NVIDIA/go-nvml v0.12.0-1 h1:6mdjtlFo+17dWL7VFPfuRMtf0061TF4DKls9pkSw6
33
github.com/NVIDIA/go-nvml v0.12.0-1/go.mod h1:hy7HYeQy335x6nEss0Ne3PYqleRa6Ct+VKD9RQ4nyFs=
44
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
55
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
6-
github.com/container-orchestrated-devices/container-device-interface v0.6.0 h1:aWwcz/Ep0Fd7ZuBjQGjU/jdPloM7ydhMW13h85jZNvk=
7-
github.com/container-orchestrated-devices/container-device-interface v0.6.0/go.mod h1:OQlgtJtDrOxSQ1BWODC8OZK1tzi9W69wek+Jy17ndzo=
86
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
97
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
108
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -29,11 +27,9 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
2927
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
3028
github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=
3129
github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
32-
github.com/opencontainers/runc v1.1.6 h1:XbhB8IfG/EsnhNvZtNdLB0GBw92GYEFvKlhaJk9jUgA=
33-
github.com/opencontainers/runc v1.1.6/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
3430
github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
35-
github.com/opencontainers/runtime-spec v1.1.0-rc.2 h1:ucBtEms2tamYYW/SvGpvq9yUN0NEVL6oyLEwDcTSrk8=
36-
github.com/opencontainers/runtime-spec v1.1.0-rc.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
31+
github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
32+
github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
3733
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 h1:DmNGcqH3WDbV5k8OJ+esPWbqUOX5rMLR2PMvziDMJi0=
3834
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626/go.mod h1:BRHJJd0E+cx42OybVYSgUvZmU0B8P9gZuRXlZUP7TKI=
3935
github.com/opencontainers/selinux v1.9.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
@@ -75,8 +71,6 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
7571
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
7672
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
7773
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
78-
gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230613182322-7663cf900f0a h1:lceJVurLqiWFdxK6KMDw+SIwrAsFW/af44XrNlbGw78=
79-
gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230613182322-7663cf900f0a/go.mod h1:KYZksBgh18o+uzgnpDazzG4LVYtnfB96VXHMXypEtik=
8074
gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230818092907-09424fdc8884 h1:V0LUbfm4kVA1CPG8FgG9AGZqa3ykE5U12Gd3PZgoItA=
8175
gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230818092907-09424fdc8884/go.mod h1:/x5Ky1ZJNyCjDkgSL1atII0EFKQF5WaIHKeP5nkaQfk=
8276
golang.org/x/mod v0.5.0 h1:UG21uOlmZabA4fW5i7ZX6bjw1xELEGg/ZLgZq9auk/Q=
@@ -98,3 +92,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
9892
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
9993
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
10094
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
95+
tags.cncf.io/container-device-interface v0.6.2 h1:dThE6dtp/93ZDGhqaED2Pu374SOeUkBfuvkLuiTdwzg=
96+
tags.cncf.io/container-device-interface v0.6.2/go.mod h1:Shusyhjs1A5Na/kqPVLL0KqnHQHuunol9LFeUNkuGVE=
97+
tags.cncf.io/container-device-interface/specs-go v0.6.0 h1:V+tJJN6dqu8Vym6p+Ru+K5mJ49WL6Aoc5SJFSY0RLsQ=
98+
tags.cncf.io/container-device-interface/specs-go v0.6.0/go.mod h1:hMAwAbMZyBLdmYqWgYcKH0F/yctNpV3P35f+/088A80=

‎internal/config/config.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25+
"tags.cncf.io/container-device-interface/pkg/cdi"
26+
2527
"github.com/NVIDIA/nvidia-container-toolkit/internal/config/image"
2628
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
2729
"github.com/NVIDIA/nvidia-container-toolkit/internal/lookup"
28-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
2930
)
3031

3132
const (

‎internal/discover/hooks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package discover
1919
import (
2020
"path/filepath"
2121

22-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
22+
"tags.cncf.io/container-device-interface/pkg/cdi"
2323
)
2424

2525
var _ Discover = (*Hook)(nil)

‎internal/edits/device.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
package edits
1818

1919
import (
20+
"tags.cncf.io/container-device-interface/pkg/cdi"
21+
"tags.cncf.io/container-device-interface/specs-go"
22+
2023
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
21-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
22-
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
2324
)
2425

2526
type device discover.Device

‎internal/edits/device_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ import (
2020
"fmt"
2121
"testing"
2222

23-
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
24-
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
2523
"github.com/stretchr/testify/require"
24+
"tags.cncf.io/container-device-interface/specs-go"
25+
26+
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
2627
)
2728

2829
func TestDeviceToSpec(t *testing.T) {

‎internal/edits/edits.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ package edits
1919
import (
2020
"fmt"
2121

22+
ociSpecs "github.com/opencontainers/runtime-spec/specs-go"
23+
"tags.cncf.io/container-device-interface/pkg/cdi"
24+
"tags.cncf.io/container-device-interface/specs-go"
25+
2226
"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
2327
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
2428
"github.com/NVIDIA/nvidia-container-toolkit/internal/oci"
25-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
26-
"github.com/container-orchestrated-devices/container-device-interface/specs-go"
27-
ociSpecs "github.com/opencontainers/runtime-spec/specs-go"
2829
)
2930

3031
type edits struct {

0 commit comments

Comments
 (0)