From acaae81f8a9e9a284237a536b2133708d8605894 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Thu, 13 Mar 2025 14:51:22 +0200
Subject: [PATCH] [no-relnote] Allow relative paths from operator structs
Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
cmd/nvidia-ctk-installer/container/operator/operator.go | 5 -----
cmd/nvidia-ctk-installer/container/operator/operator_test.go | 3 +--
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/cmd/nvidia-ctk-installer/container/operator/operator.go b/cmd/nvidia-ctk-installer/container/operator/operator.go
index d88e9faf..5778d9bc 100644
--- a/cmd/nvidia-ctk-installer/container/operator/operator.go
+++ b/cmd/nvidia-ctk-installer/container/operator/operator.go
@@ -20,8 +20,6 @@ import "path/filepath"
const (
defaultRuntimeName = "nvidia"
-
- defaultRoot = "/usr/bin"
)
// Runtime defines a runtime to be configured.
@@ -48,9 +46,6 @@ func GetRuntimes(opts ...Option) Runtimes {
opt(c)
}
- if c.root == "" {
- c.root = defaultRoot
- }
if c.nvidiaRuntimeName == "" {
c.nvidiaRuntimeName = defaultRuntimeName
}
diff --git a/cmd/nvidia-ctk-installer/container/operator/operator_test.go b/cmd/nvidia-ctk-installer/container/operator/operator_test.go
index f1e53994..40e90161 100644
--- a/cmd/nvidia-ctk-installer/container/operator/operator_test.go
+++ b/cmd/nvidia-ctk-installer/container/operator/operator_test.go
@@ -27,7 +27,6 @@ func TestOptions(t *testing.T) {
testCases := []struct {
setAsDefault bool
nvidiaRuntimeName string
- root string
expectedDefaultRuntime string
expectedRuntimes Runtimes
}{
@@ -131,7 +130,7 @@ func TestOptions(t *testing.T) {
runtimes := GetRuntimes(
WithNvidiaRuntimeName(tc.nvidiaRuntimeName),
WithSetAsDefault(tc.setAsDefault),
- WithRoot(tc.root),
+ WithRoot("/usr/bin"),
)
require.EqualValues(t, tc.expectedRuntimes, runtimes)