Merge pull request #2090 from arnaldo2792/fix-nvidia-dependencies

Fix NVIDIA tools dependencies
bottlerocket-os · Apr 22, 2022 · 86d982b · 86d982b
2 parents dd547f1 + f3a9afc
commit 86d982b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/packages/nvidia-container-toolkit/Cargo.toml b/packages/nvidia-container-toolkit/Cargo.toml
@@ -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" }
diff --git a/packages/nvidia-container-toolkit/nvidia-container-toolkit.spec b/packages/nvidia-container-toolkit/nvidia-container-toolkit.spec
@@ -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
 
 %description
 %{summary}.

diff --git a/variants/Cargo.lock b/variants/Cargo.lock
diff --git a/variants/aws-k8s-1.21-nvidia/Cargo.toml b/variants/aws-k8s-1.21-nvidia/Cargo.toml
@@ -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 = [
@@ -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" }
diff --git a/variants/aws-k8s-1.22-nvidia/Cargo.toml b/variants/aws-k8s-1.22-nvidia/Cargo.toml
@@ -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 = [
@@ -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" }