From 1874ff3f7725a2f06156589242ae5070e1b2f220 Mon Sep 17 00:00:00 2001
From: omrishiv <327609+omrishiv@users.noreply.github.com>
Date: Tue, 21 Oct 2025 11:16:41 -0700
Subject: [PATCH] enable device plugin specific node selector

Signed-off-by: omrishiv <327609+omrishiv@users.noreply.github.com>
---
 .../nvidia-device-plugin/templates/daemonset-device-plugin.yml | 3 ++-
 deployments/helm/nvidia-device-plugin/values.yaml              | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/deployments/helm/nvidia-device-plugin/templates/daemonset-device-plugin.yml b/deployments/helm/nvidia-device-plugin/templates/daemonset-device-plugin.yml
index dacc71473..e5b8ad83b 100644
--- a/deployments/helm/nvidia-device-plugin/templates/daemonset-device-plugin.yml
+++ b/deployments/helm/nvidia-device-plugin/templates/daemonset-device-plugin.yml
@@ -18,6 +18,7 @@
 {{- $useServiceAccount := $options.hasConfigMap }}
 {{- $configMapName := (include "nvidia-device-plugin.configMapName" .) | trim }}
 {{- $daemonsetName := printf "%s" (include "nvidia-device-plugin.fullname" .) | trunc 63 | trimSuffix "-" }}
+{{- $devicePluginNodeSelector := merge .Values.devicePlugin.nodeSelector .Values.nodeSelector }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -255,7 +256,7 @@ spec:
         - name: config
           emptyDir: {}
       {{- end }}
-      {{- with .Values.nodeSelector }}
+      {{- with $devicePluginNodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/deployments/helm/nvidia-device-plugin/values.yaml b/deployments/helm/nvidia-device-plugin/values.yaml
index dab72534e..8432c3f9c 100644
--- a/deployments/helm/nvidia-device-plugin/values.yaml
+++ b/deployments/helm/nvidia-device-plugin/values.yaml
@@ -102,6 +102,7 @@ runtimeClassName: null
 
 devicePlugin:
   enabled: true
+  nodeSelector: {}
 
 gfd:
   enabled: false