Merge branch 'fix-gdrcopy-nvdriver' into 'master'

[nvdriver] Add missing env in DTK container for GDRCopy See merge request nvidia/kubernetes/gpu-operator!1009
NVIDIA · Feb 2, 2024 · 78cd663 · 78cd663
2 parents a3a8121 + 1496004
commit 78cd663
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/internal/state/testdata/golden/driver-gdrcopy-openshift.yaml b/internal/state/testdata/golden/driver-gdrcopy-openshift.yaml
@@ -341,6 +341,8 @@ spec:
           value: 413.92.202304252344-0
         - name: NVIDIA_VISIBLE_DEVICES
           value: void
+        - name: GDRCOPY_ENABLED
+          value: "true"
         image: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fecaebc1d51b28bc3548171907e4d91823a031d7a6a694ab686999be2b4d867
         imagePullPolicy: IfNotPresent
         name: openshift-driver-toolkit-ctr

diff --git a/manifests/state-driver/0500_daemonset.yaml b/manifests/state-driver/0500_daemonset.yaml
@@ -543,6 +543,10 @@ spec:
           - name: GDS_ENABLED
             value: "true"
           {{- end }}
+          {{- if and (.GDRCopy) (deref .GDRCopy.Spec.Enabled) }}
+          - name: GDRCOPY_ENABLED
+            value: "true"
+          {{- end }}
         volumeMounts:
           # corresponding volumes are dynamically injected by the
           # operator when the OCP DriverToolkit side-car is enabled