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 6cfa5042b..515d17047 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: @@ -259,7 +260,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 5953c77f8..41a109071 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