replace CONTAINER_DRIVER_ROOT to DRIVER_ROOT_CTR_PATH

Signed-off-by: rongfu.leng <[email protected]>
NVIDIA · Dec 17, 2024 · d5d906a · d5d906a
1 parent 32805fe
commit d5d906a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/cmd/nvidia-dra-plugin/main.go b/cmd/nvidia-dra-plugin/main.go
@@ -105,7 +105,7 @@ func newApp() *cli.App {
 			Value:       "/driver-root",
 			Usage:       "the path where the NVIDIA driver root is mounted in the container; used for generating CDI specifications",
 			Destination: &flags.containerDriverRoot,
-			EnvVars:     []string{"CONTAINER_DRIVER_ROOT"},
+			EnvVars:     []string{"DRIVER_ROOT_CTR_PATH"},
 		},
 		&cli.StringFlag{
 			Name:        "nvidia-ctk-path",

diff --git a/deployments/helm/k8s-dra-driver/templates/kubeletplugin.yaml b/deployments/helm/k8s-dra-driver/templates/kubeletplugin.yaml
@@ -75,6 +75,8 @@ spec:
           value: "{{ .Values.nvidiaCtkPath }}"
         - name: NVIDIA_DRIVER_ROOT
           value: "{{ .Values.nvidiaDriverRoot }}"
+        - name: DRIVER_ROOT_CTR_PATH
+          value: "{{ .Values.driverRootCtrPath }}"
         - name: NVIDIA_VISIBLE_DEVICES
           value: void
         - name: CDI_ROOT

diff --git a/deployments/helm/k8s-dra-driver/values.yaml b/deployments/helm/k8s-dra-driver/values.yaml
@@ -22,6 +22,9 @@
 # For driver installed directly on a host, a value of `/` is used.
 nvidiaDriverRoot: /
 
+# the path where the NVIDIA driver root is mounted in the container; used for generating CDI specifications
+driverRootCtrPath: /driver-root
+
 # Specify the path of CTK binary (nvidia-ctk) on the host,
 # as it should appear in the the generated CDI specification.
 # The path depends on the system that runs on the node.