From 47c208aab37a9e41e82dae4aa201fa9435e86dfb Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 10 Mar 2025 09:05:36 +0200 Subject: [PATCH] [no-relnote] Output sorted specs Signed-off-by: Evan Lezar --- .../container/toolkit/toolkit_test.go | 44 ++++++++--------- cmd/nvidia-ctk/cdi/generate/generate_test.go | 48 +++++++++---------- pkg/nvcdi/lib-imex_test.go | 34 ++++++------- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/cmd/nvidia-ctk-installer/container/toolkit/toolkit_test.go b/cmd/nvidia-ctk-installer/container/toolkit/toolkit_test.go index 855141ff..4aad36c5 100644 --- a/cmd/nvidia-ctk-installer/container/toolkit/toolkit_test.go +++ b/cmd/nvidia-ctk-installer/container/toolkit/toolkit_test.go @@ -69,47 +69,47 @@ func TestInstall(t *testing.T) { cdiEnabled: true, expectedCdiSpec: `--- cdiVersion: 0.5.0 +kind: example.com/class +devices: +- name: all + containerEdits: + deviceNodes: + - path: /dev/nvidia0 + hostPath: /host/driver/root/dev/nvidia0 + - path: /dev/nvidiactl + hostPath: /host/driver/root/dev/nvidiactl + - path: /dev/nvidia-caps-imex-channels/channel0 + hostPath: /host/driver/root/dev/nvidia-caps-imex-channels/channel0 + - path: /dev/nvidia-caps-imex-channels/channel1 + hostPath: /host/driver/root/dev/nvidia-caps-imex-channels/channel1 + - path: /dev/nvidia-caps-imex-channels/channel2047 + hostPath: /host/driver/root/dev/nvidia-caps-imex-channels/channel2047 containerEdits: env: - NVIDIA_VISIBLE_DEVICES=void hooks: - - args: + - hookName: createContainer + path: {{ .toolkitRoot }}/nvidia-cdi-hook + args: - nvidia-cdi-hook - create-symlinks - --link - libcuda.so.1::/lib/x86_64-linux-gnu/libcuda.so - hookName: createContainer + - hookName: createContainer path: {{ .toolkitRoot }}/nvidia-cdi-hook - - args: + args: - nvidia-cdi-hook - update-ldcache - --folder - /lib/x86_64-linux-gnu - hookName: createContainer - path: {{ .toolkitRoot }}/nvidia-cdi-hook mounts: - - containerPath: /lib/x86_64-linux-gnu/libcuda.so.999.88.77 - hostPath: /host/driver/root/lib/x86_64-linux-gnu/libcuda.so.999.88.77 + - hostPath: /host/driver/root/lib/x86_64-linux-gnu/libcuda.so.999.88.77 + containerPath: /lib/x86_64-linux-gnu/libcuda.so.999.88.77 options: - ro - nosuid - nodev - bind -devices: -- containerEdits: - deviceNodes: - - hostPath: /host/driver/root/dev/nvidia0 - path: /dev/nvidia0 - - hostPath: /host/driver/root/dev/nvidiactl - path: /dev/nvidiactl - - hostPath: /host/driver/root/dev/nvidia-caps-imex-channels/channel0 - path: /dev/nvidia-caps-imex-channels/channel0 - - hostPath: /host/driver/root/dev/nvidia-caps-imex-channels/channel1 - path: /dev/nvidia-caps-imex-channels/channel1 - - hostPath: /host/driver/root/dev/nvidia-caps-imex-channels/channel2047 - path: /dev/nvidia-caps-imex-channels/channel2047 - name: all -kind: example.com/class `, }, } diff --git a/cmd/nvidia-ctk/cdi/generate/generate_test.go b/cmd/nvidia-ctk/cdi/generate/generate_test.go index 57bd865a..c74cff23 100644 --- a/cmd/nvidia-ctk/cdi/generate/generate_test.go +++ b/cmd/nvidia-ctk/cdi/generate/generate_test.go @@ -65,53 +65,53 @@ func TestGenerateSpec(t *testing.T) { }, expectedSpec: `--- cdiVersion: 0.5.0 +kind: example.com/device +devices: +- name: "0" + containerEdits: + deviceNodes: + - path: /dev/nvidia0 + hostPath: {{ .driverRoot }}/dev/nvidia0 +- name: all + containerEdits: + deviceNodes: + - path: /dev/nvidia0 + hostPath: {{ .driverRoot }}/dev/nvidia0 containerEdits: - deviceNodes: - - hostPath: {{ .driverRoot }}/dev/nvidiactl - path: /dev/nvidiactl env: - NVIDIA_VISIBLE_DEVICES=void + deviceNodes: + - path: /dev/nvidiactl + hostPath: {{ .driverRoot }}/dev/nvidiactl hooks: - - args: + - hookName: createContainer + path: /usr/bin/nvidia-cdi-hook + args: - nvidia-cdi-hook - create-symlinks - --link - libcuda.so.1::/lib/x86_64-linux-gnu/libcuda.so - hookName: createContainer + - hookName: createContainer path: /usr/bin/nvidia-cdi-hook - - args: + args: - nvidia-cdi-hook - enable-cuda-compat - --host-driver-version=999.88.77 - hookName: createContainer + - hookName: createContainer path: /usr/bin/nvidia-cdi-hook - - args: + args: - nvidia-cdi-hook - update-ldcache - --folder - /lib/x86_64-linux-gnu - hookName: createContainer - path: /usr/bin/nvidia-cdi-hook mounts: - - containerPath: /lib/x86_64-linux-gnu/libcuda.so.999.88.77 - hostPath: {{ .driverRoot }}/lib/x86_64-linux-gnu/libcuda.so.999.88.77 + - hostPath: {{ .driverRoot }}/lib/x86_64-linux-gnu/libcuda.so.999.88.77 + containerPath: /lib/x86_64-linux-gnu/libcuda.so.999.88.77 options: - ro - nosuid - nodev - bind -devices: -- containerEdits: - deviceNodes: - - hostPath: {{ .driverRoot }}/dev/nvidia0 - path: /dev/nvidia0 - name: "0" -- containerEdits: - deviceNodes: - - hostPath: {{ .driverRoot }}/dev/nvidia0 - path: /dev/nvidia0 - name: all -kind: example.com/device `, }, } diff --git a/pkg/nvcdi/lib-imex_test.go b/pkg/nvcdi/lib-imex_test.go index c6d099c9..e928fddd 100644 --- a/pkg/nvcdi/lib-imex_test.go +++ b/pkg/nvcdi/lib-imex_test.go @@ -39,26 +39,26 @@ func TestImexMode(t *testing.T) { expectedSpec := `--- cdiVersion: 0.5.0 +kind: nvidia.com/imex-channel +devices: +- name: "0" + containerEdits: + deviceNodes: + - path: /dev/nvidia-caps-imex-channels/channel0 + hostPath: {{ .hostRoot }}/dev/nvidia-caps-imex-channels/channel0 +- name: "1" + containerEdits: + deviceNodes: + - path: /dev/nvidia-caps-imex-channels/channel1 + hostPath: {{ .hostRoot }}/dev/nvidia-caps-imex-channels/channel1 +- name: "2047" + containerEdits: + deviceNodes: + - path: /dev/nvidia-caps-imex-channels/channel2047 + hostPath: {{ .hostRoot }}/dev/nvidia-caps-imex-channels/channel2047 containerEdits: env: - NVIDIA_VISIBLE_DEVICES=void -devices: -- containerEdits: - deviceNodes: - - hostPath: {{ .hostRoot }}/dev/nvidia-caps-imex-channels/channel0 - path: /dev/nvidia-caps-imex-channels/channel0 - name: "0" -- containerEdits: - deviceNodes: - - hostPath: {{ .hostRoot }}/dev/nvidia-caps-imex-channels/channel1 - path: /dev/nvidia-caps-imex-channels/channel1 - name: "1" -- containerEdits: - deviceNodes: - - hostPath: {{ .hostRoot }}/dev/nvidia-caps-imex-channels/channel2047 - path: /dev/nvidia-caps-imex-channels/channel2047 - name: "2047" -kind: nvidia.com/imex-channel ` expectedSpec = strings.ReplaceAll(expectedSpec, "{{ .hostRoot }}", hostRoot)