Skip to content
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

Jump to bottom

Fix NVIDIA tools dependencies #2090

Merged
merged 1 commit into from
Apr 22, 2022
Merged

Fix NVIDIA tools dependencies #2090

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
1 change: 0 additions & 1 deletion packages/nvidia-container-toolkit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ sha512 = "7bc3601ca5cca5b3ad7f30f9c2453d41452b425811d37209c20b7f375d557666a1369d
[build-dependencies]
glibc = { path = "../glibc" }
libnvidia-container = { path = "../libnvidia-container" }
nvidia-k8s-device-plugin = { path = "../nvidia-k8s-device-plugin" }
# This package depends on `shimpei`, but it is built in the `os` package
# which is expected to be pulled in
# os = { path = "../os" }
1 change: 0 additions & 1 deletion 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 @@ -20,7 +20,6 @@ Source3: nvidia-oci-hooks-json
BuildRequires: %{_cross_os}glibc-devel
Requires: %{_cross_os}libnvidia-container
Requires: %{_cross_os}shimpei
Requires: %{_cross_os}nvidia-k8s-device-plugin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're removing this dependency but should it be reversed? Does nvidia-k8s-device-plugin work as expected if nvidia-container-toolkit is not installed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, nvidia-k8s-device-plugin doesn't require nvidia-container-toolkit to work properly, it won't try to call any binary provided by nvidia-container-toolkit and it only registers itself with the kubelet.


%description
%{summary}.
Expand Down
3 changes: 2 additions & 1 deletion variants/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions variants/aws-k8s-1.21-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ included-packages = [
"kubelet-1.21",
"release",
"nvidia-container-toolkit",
"nvidia-k8s-device-plugin",
"kmod-5.10-nvidia-tesla-470"
]
kernel-parameters = [
Expand All @@ -39,4 +40,5 @@ kernel-5_10 = { path = "../../packages/kernel-5.10" }
kubernetes-1_21 = { path = "../../packages/kubernetes-1.21" }
release = { path = "../../packages/release" }
nvidia-container-toolkit = { path = "../../packages/nvidia-container-toolkit" }
nvidia-k8s-device-plugin = { path = "../../packages/nvidia-k8s-device-plugin" }
kmod-5_10-nvidia = { path = "../../packages/kmod-5.10-nvidia" }
2 changes: 2 additions & 0 deletions variants/aws-k8s-1.22-nvidia/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ included-packages = [
"kubelet-1.22",
"release",
"nvidia-container-toolkit",
"nvidia-k8s-device-plugin",
"kmod-5.10-nvidia-tesla-470"
]
kernel-parameters = [
Expand All @@ -39,4 +40,5 @@ kernel-5_10 = { path = "../../packages/kernel-5.10" }
kubernetes-1_22 = { path = "../../packages/kubernetes-1.22" }
release = { path = "../../packages/release" }
nvidia-container-toolkit = { path = "../../packages/nvidia-container-toolkit" }
nvidia-k8s-device-plugin = { path = "../../packages/nvidia-k8s-device-plugin" }
kmod-5_10-nvidia = { path = "../../packages/kmod-5.10-nvidia" }