Skip to content

Commit ce6408f

Browse files
committed
remove local talos library search paths
1 parent 302f40e commit ce6408f

File tree

2 files changed

+0
-20
lines changed
  • cmd

2 files changed

+0
-20
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@ const (
4646
defaultCDIRoot = "/var/run/cdi"
4747
)
4848

49-
func getTalosLibrarySearchPaths() []string {
50-
return []string{
51-
"/driver-root/usr/local/glibc/usr/lib",
52-
"/driver-root/usr/local/glibc/lib",
53-
"/driver-root/usr/local/glibc/lib64",
54-
}
55-
}
56-
5749
type CDIHandler struct {
5850
logger *logrus.Logger
5951
nvml nvml.Interface
@@ -111,7 +103,6 @@ func NewCDIHandler(opts ...cdiOption) (*CDIHandler, error) {
111103
nvcdi.WithVendor(h.vendor),
112104
nvcdi.WithClass(h.deviceClass),
113105
nvcdi.WithNVIDIACDIHookPath(h.nvidiaCDIHookPath),
114-
nvcdi.WithLibrarySearchPaths(getTalosLibrarySearchPaths()),
115106
)
116107
if err != nil {
117108
return nil, fmt.Errorf("unable to create CDI library for devices: %w", err)
@@ -129,7 +120,6 @@ func NewCDIHandler(opts ...cdiOption) (*CDIHandler, error) {
129120
nvcdi.WithVendor(h.vendor),
130121
nvcdi.WithClass(h.claimClass),
131122
nvcdi.WithNVIDIACDIHookPath(h.nvidiaCDIHookPath),
132-
nvcdi.WithLibrarySearchPaths(getTalosLibrarySearchPaths()),
133123
)
134124
if err != nil {
135125
return nil, fmt.Errorf("unable to create CDI library for claims: %w", err)

cmd/gpu-kubelet-plugin/cdi.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,6 @@ const (
5151
procNvCapsPath = "/proc/driver/nvidia/capabilities"
5252
)
5353

54-
func getTalosLibrarySearchPaths() []string {
55-
return []string{
56-
"/driver-root/usr/local/glibc/usr/lib",
57-
"/driver-root/usr/local/glibc/lib",
58-
"/driver-root/usr/local/glibc/lib64",
59-
}
60-
}
61-
6254
type CDIHandler struct {
6355
logger *logrus.Logger
6456
nvml nvml.Interface
@@ -116,7 +108,6 @@ func NewCDIHandler(opts ...cdiOption) (*CDIHandler, error) {
116108
nvcdi.WithVendor(h.vendor),
117109
nvcdi.WithClass(h.deviceClass),
118110
nvcdi.WithNVIDIACDIHookPath(h.nvidiaCDIHookPath),
119-
nvcdi.WithLibrarySearchPaths(getTalosLibrarySearchPaths()),
120111
)
121112
if err != nil {
122113
return nil, fmt.Errorf("unable to create CDI library for devices: %w", err)
@@ -134,7 +125,6 @@ func NewCDIHandler(opts ...cdiOption) (*CDIHandler, error) {
134125
nvcdi.WithVendor(h.vendor),
135126
nvcdi.WithClass(h.claimClass),
136127
nvcdi.WithNVIDIACDIHookPath(h.nvidiaCDIHookPath),
137-
nvcdi.WithLibrarySearchPaths(getTalosLibrarySearchPaths()),
138128
)
139129
if err != nil {
140130
return nil, fmt.Errorf("unable to create CDI library for claims: %w", err)

0 commit comments

Comments
 (0)