Skip to content

Use public packages to create dev/char symlinks #1819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
elezar wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Use public packages to create dev/char symlinks #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2c6a87
TOFIX: Vendor local changes
elezar Oct 22, 2025
51fcaf8
Use public packages to create dev/char symlinks
elezar Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions cmd/nvidia-validator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ import (

"github.com/NVIDIA/go-nvlib/pkg/nvmdev"
"github.com/NVIDIA/go-nvlib/pkg/nvpci"
devchar "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/system/nvdevices"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/system/nvmodules"
log "github.com/sirupsen/logrus"
cli "github.com/urfave/cli/v2"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -865,21 +866,27 @@ func createDevCharSymlinks(driverInfo driverInfo, disableDevCharSymlinkCreation
driverRootCtrPath = "/host"
}

// We now create the symlinks in /dev/char.
creator, err := devchar.NewSymlinkCreator(
devchar.WithDriverRoot(driverRootCtrPath),
devchar.WithDevRoot(driverInfo.devRoot),
devchar.WithDevCharPath(hostDevCharPath),
devchar.WithCreateAll(true),
devchar.WithCreateDeviceNodes(true),
devchar.WithLoadKernelModules(loadKernelModules),
if loadKernelModules {
modules := nvmodules.New(
nvmodules.WithRoot(driverRootCtrPath),
)
if err := modules.LoadAll(); err != nil {
return fmt.Errorf("failed to load NVIDIA kernel modules: %v", err)
Copy link
Contributor

@tariq1890 tariq1890 Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return fmt.Errorf("failed to load NVIDIA kernel modules: %v", err)
return fmt.Errorf("failed to load NVIDIA kernel modules: %w", err)

}
}

devices, err := nvdevices.New(
nvdevices.WithDevRoot(driverInfo.devRoot),
)
if err != nil {
return fmt.Errorf("error creating symlink creator: %w", err)
return err
}

err = creator.CreateLinks()
if err != nil {
if err := devices.CreateNVIDIAControlDevices(); err != nil {
return fmt.Errorf("failed to create device nodes for NVIDIA control devices: %v", err)
Copy link
Contributor

@tariq1890 tariq1890 Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return fmt.Errorf("failed to create device nodes for NVIDIA control devices: %v", err)
return fmt.Errorf("failed to create device nodes for NVIDIA control devices: %w", err)

}
// We now create the symlinks in /dev/char on the host.
if err := devices.CreateDevCharSymlinks(hostDevCharPath, false); err != nil {
return fmt.Errorf("error creating symlinks: %w", err)
}

Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ require (
github.com/spf13/cobra v1.10.1 // indirect
github.com/spf13/pflag v1.0.9 // indirect
github.com/ulikunitz/xz v0.5.15 // indirect
github.com/urfave/cli/v3 v3.4.1 // indirect
github.com/urfave/cli/v3 v3.5.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
Expand Down Expand Up @@ -129,3 +129,5 @@ require (
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
)

replace github.com/NVIDIA/nvidia-container-toolkit => ../container-toolkit
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ github.com/NVIDIA/k8s-kata-manager v0.2.3 h1:d5+gRFqU5el/fKMXhHUaPY7haj+dbHL4nDs
github.com/NVIDIA/k8s-kata-manager v0.2.3/go.mod h1:xx5OUiMsHyKbyX0JjKHqAftvqS8vx00LFn/5EaMdtB4=
github.com/NVIDIA/k8s-operator-libs v0.0.0-20250709180754-c80af13d73e3 h1:vGT+oyUY7kOGLd71Cz0NfRVEep23jdd4fi+PYsZEj88=
github.com/NVIDIA/k8s-operator-libs v0.0.0-20250709180754-c80af13d73e3/go.mod h1:0GPZJRwr6nY1IVhGUyzG9YfKhNFQq8UlhYe4u7jVF0U=
github.com/NVIDIA/nvidia-container-toolkit v1.18.0 h1:bXoKq9C1WHU5fF6VqXvX3RkMzpp4ihTUgBPrh66vTf0=
github.com/NVIDIA/nvidia-container-toolkit v1.18.0/go.mod h1:ZxWSG7fnFo2Z7xSGtMyZVF7WnTbj1lgx4dMrBLUq90g=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
Expand Down Expand Up @@ -219,8 +217,8 @@ github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU=
github.com/urfave/cli/v2 v2.27.7/go.mod h1:CyNAG/xg+iAOg0N4MPGZqVmv2rCoP267496AOXUZjA4=
github.com/urfave/cli/v3 v3.4.1 h1:1M9UOCy5bLmGnuu1yn3t3CB4rG79Rtoxuv1sPhnm6qM=
github.com/urfave/cli/v3 v3.4.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
github.com/urfave/cli/v3 v3.5.0 h1:qCuFMmdayTF3zmjG8TSsoBzrDqszNrklYg2x3g4MSgw=
github.com/urfave/cli/v3 v3.5.0/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
Expand Down
110 changes: 26 additions & 84 deletions ...tainer-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/create-dev-char-symlinks.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

89 changes: 0 additions & 89 deletions ...VIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing.go
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions ...nvidia-container-toolkit/cmd/nvidia-ctk/system/create-dev-char-symlinks/existing_linux.go
View file
Open in desktop

This file was deleted.

Loading
Loading