Merge pull request #267 from elezar/bump-nvidia-container-toolkit

Bump nvcdi package to v1.17.5

Author: elezar

cmd/compute-domain-kubelet-plugin/cdi.go

@@ -120,6 +120,8 @@ func NewCDIHandler(opts ...cdiOption) (*CDIHandler, error) {
 			nvcdi.WithVendor(h.vendor),
 			nvcdi.WithClass(h.claimClass),
 			nvcdi.WithNVIDIACDIHookPath(h.nvidiaCTKPath),
+			// TODO: This should be removed once the use of a NVIDIA Container Toolkit >= v1.17.5 is commonplace.
+			nvcdi.WithDisabledHook(nvcdi.HookEnableCudaCompat),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("unable to create CDI library for claims: %w", err)

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/NVIDIA/go-nvlib v0.7.1
 	github.com/NVIDIA/go-nvml v0.12.4-1
-	github.com/NVIDIA/nvidia-container-toolkit v1.17.1-0.20250206090248-1d0777ee0165
+	github.com/NVIDIA/nvidia-container-toolkit v1.17.5-rc.1
 	github.com/google/uuid v1.6.0
 	github.com/prometheus/client_golang v1.19.1
 	github.com/sirupsen/logrus v1.9.3
@@ -56,7 +56,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/opencontainers/runtime-spec v1.2.0 // indirect
+	github.com/opencontainers/runtime-spec v1.2.1 // indirect
 	github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -89,3 +89,7 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
+
+// The k8s-dra-driver does not need to modify the OCI Runtime Specifications and as such
+// this transitive dependency is not needed. We skip the transitive update from the new nvcdi version.
+replace github.com/opencontainers/runtime-spec v1.2.1 => github.com/opencontainers/runtime-spec v1.2.0

go.sum

@@ -6,8 +6,8 @@ github.com/NVIDIA/go-nvlib v0.7.1 h1:7HHPZxoCjSLm1NgaRRjuhI8ffMCpc5Vgpg5yxQYUff8
 github.com/NVIDIA/go-nvlib v0.7.1/go.mod h1:2Kh2kYSP5IJ8EKf0/SYDzHiQKb9EJkwOf2LQzu6pXzY=
 github.com/NVIDIA/go-nvml v0.12.4-1 h1:WKUvqshhWSNTfm47ETRhv0A0zJyr1ncCuHiXwoTrBEc=
 github.com/NVIDIA/go-nvml v0.12.4-1/go.mod h1:8Llmj+1Rr+9VGGwZuRer5N/aCjxGuR5nPb/9ebBiIEQ=
-github.com/NVIDIA/nvidia-container-toolkit v1.17.1-0.20250206090248-1d0777ee0165 h1:YYs5V+gwO+qnjLK0yhHGvXGWdbqMOmst/5aJEcIkA1Q=
-github.com/NVIDIA/nvidia-container-toolkit v1.17.1-0.20250206090248-1d0777ee0165/go.mod h1:HbdWdB4ukjPWvSIYhNFKthzVuQATUBEXxSskcABWvP0=
+github.com/NVIDIA/nvidia-container-toolkit v1.17.5-rc.1 h1:z/+l/9OgYSdgbx83ynKxbOX5V2wP9h7Lh2/b0CvYFZI=
+github.com/NVIDIA/nvidia-container-toolkit v1.17.5-rc.1/go.mod h1:UQcbm+GRu+Dwmeyqtwq2HDa57Xq82zzQsmUusidtndM=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=