Merge branch 'helm-updates' into 'main'

Update GFD Helm Chart to fix deployment with nfd.nodefeatureapi=true See merge request nvidia/kubernetes/device-plugin!316
NVIDIA · Oct 24, 2023 · f148136 · f148136
2 parents d03f4aa + d962d0c
commit f148136
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/deployments/helm/gpu-feature-discovery/templates/_helpers.tpl b/deployments/helm/gpu-feature-discovery/templates/_helpers.tpl
@@ -24,6 +24,17 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "gpu-feature-discovery.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

diff --git a/deployments/helm/gpu-feature-discovery/templates/rbac.yaml b/deployments/helm/gpu-feature-discovery/templates/rbac.yaml
@@ -32,6 +32,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: gpu-feature-discovery
-  namespace: node-feature-discovery
-
+  namespace: {{ include "gpu-feature-discovery.namespace" . }}
 {{- end }}