Skip to content

Always provide service to generate CDI specs #507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2025
Merged

Always provide service to generate CDI specs #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/nvidia-container-toolkit/generate-cdi-specs.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ Type=oneshot
# Explanation of the options:
# --format json: to be consistent across Bottlerocket's variants
# --mode nvml: the default mode ("auto") resolves to this already, make it explicit
# --device-name-strategy uuid: the ECS agent only supports device UUIDs
# --device-name-strategy uuid: the ECS agent only supports device UUIDs; for k8s
# this is irrelevant because these specs will be used
# only when NVIDIA_VISIBLE_DEVICES is "all"
# --output /etc/cdi/nvidia.json: store the CDI specifications at this location
ExecStart=/usr/bin/nvidia-ctk cdi generate --format json \
--mode nvml \
Expand Down
12 changes: 1 addition & 11 deletions packages/nvidia-container-toolkit/nvidia-container-toolkit.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Requires: (%{name}-k8s if %{_cross_os}variant-family(aws-k8s))
%package ecs
Summary: Files specific for the ECS variants
Requires: %{name}
Requires: %{name}-cdi-specs
Conflicts: %{name}-k8s

%description ecs
Expand All @@ -50,13 +49,6 @@ Conflicts: %{name}-ecs
%description k8s
%{summary}.

%package cdi-specs
Summary: Tools to generate CDI specifications
Requires: %{name}

%description cdi-specs
%{summary}.

%prep
%autosetup -n %{gorepo}-%{gover} -p1
%cross_go_setup %{gorepo}-%{gover} %{goproject} %{goimport}
Expand Down Expand Up @@ -103,6 +95,7 @@ install -m 0644 %{S:7} %{buildroot}%{_cross_unitdir}/
%{_cross_bindir}/nvidia-cdi-hook
%{_cross_bindir}/nvidia-container-runtime
%{_cross_udevrulesdir}/90-nvidia-gpu-devices.rules
%{_cross_unitdir}/generate-cdi-specs.service

%files ecs
%{_cross_factorydir}/nvidia-container-runtime/nvidia-container-toolkit-config-ecs.toml
Expand All @@ -112,6 +105,3 @@ install -m 0644 %{S:7} %{buildroot}%{_cross_unitdir}/
%{_cross_factorydir}/nvidia-container-runtime/nvidia-container-toolkit-config-k8s.toml
%{_cross_templatedir}/nvidia-container-runtime/nvidia-container-toolkit-config-k8s
%{_cross_tmpfilesdir}/nvidia-container-toolkit-k8s.conf

%files cdi-specs
%{_cross_unitdir}/generate-cdi-specs.service