test fixes

NVIDIA · Oct 31, 2024 · 0830cee · 0830cee
1 parent 4fa5aca
commit 0830cee
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/assets/state-driver/0500_daemonset.yaml b/assets/state-driver/0500_daemonset.yaml
@@ -90,6 +90,7 @@ spec:
               mountPropagation: HostToContainer
         - name: check-imex-config
           image: "FILLED BY THE OPERATOR"
+          imagePullPolicy: IfNotPresent
           command: ["/bin/bash", "-c"]
           args:
             - |

diff --git a/internal/state/testdata/golden/driver-minimal.yaml b/internal/state/testdata/golden/driver-minimal.yaml
@@ -194,27 +194,6 @@ spec:
           name: imex-config
       hostPID: true
       initContainers:
-      - args:
-        - |
-          IMEX_NODES_CONFIG_FILE=/etc/nvidia-imex/nodes_config.cfg
-          if [[ -f /host/${IMEX_NODES_CONFIG_FILE} ]]; then
-            echo "Copying host IMEX nodes config"
-            cp /host/${IMEX_NODES_CONFIG_FILE} ${IMEX_NODES_CONFIG_FILE}
-          fi
-        command:
-        - /bin/bash
-        - -c
-        image: nvcr.io/nvidia/driver:525.85.03-ubuntu22.04
-        name: check-imex-config
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - mountPath: /host/etc
-          name: host-etc
-          readOnly: true
-          subPath: etc
-        - mountPath: /etc/nvidia-imex
-          name: imex-config
       - args:
         - uninstall_driver
         command:
@@ -260,6 +239,28 @@ spec:
         - mountPath: /run/mellanox/drivers
           mountPropagation: HostToContainer
           name: run-mellanox-drivers
+      - args:
+        - |
+          IMEX_NODES_CONFIG_FILE=/etc/nvidia-imex/nodes_config.cfg
+          if [[ -f /host/${IMEX_NODES_CONFIG_FILE} ]]; then
+            echo "Copying host IMEX nodes config"
+            cp /host/${IMEX_NODES_CONFIG_FILE} ${IMEX_NODES_CONFIG_FILE}
+          fi
+        command:
+        - /bin/bash
+        - -c
+        image: nvcr.io/nvidia/driver:525.85.03-ubuntu22.04
+        imagePullPolicy: IfNotPresent
+        name: check-imex-config
+        securityContext:
+          privileged: true
+        volumeMounts:
+        - mountPath: /host/etc
+          name: host-etc
+          readOnly: true
+          subPath: etc
+        - mountPath: /etc/nvidia-imex
+          name: imex-config
       nodeSelector:
         nvidia.com/gpu.deploy.driver: "true"
       priorityClassName: system-node-critical

diff --git a/manifests/state-driver/0500_daemonset.yaml b/manifests/state-driver/0500_daemonset.yaml
@@ -179,7 +179,8 @@ spec:
               mountPath: /run/mellanox/drivers
               mountPropagation: HostToContainer
         - name: check-imex-config
-          image: "FILLED BY THE OPERATOR"
+          image: {{ .Driver.ImagePath }}
+          imagePullPolicy: {{ default "IfNotPresent" .Driver.Spec.ImagePullPolicy }}
           command: ["/bin/bash", "-c"]
           args:
             - |