From 239143c85604e367ffad619fc9ad7aa8dc3a56ef Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 19 Apr 2024 13:39:25 +0000 Subject: [PATCH] feature: final touches to make latest Nvidia GPU support work on V1.28 --- kubezero/aws-neuron-driver/APKBUILD | 4 ++-- kubezero/ecr-credential-provider/APKBUILD | 2 +- kubezero/kubernetes/APKBUILD | 4 ++-- kubezero/kubezero/APKBUILD | 2 +- kubezero/nvidia-container-toolkit/APKBUILD | 24 ++++++++++++++-------- kubezero/nvidia-drivers/APKBUILD | 4 ++-- kubezero/nvidia-open-gpu/APKBUILD | 4 ++-- 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/kubezero/aws-neuron-driver/APKBUILD b/kubezero/aws-neuron-driver/APKBUILD index 7e356fc..3fcb2ee 100644 --- a/kubezero/aws-neuron-driver/APKBUILD +++ b/kubezero/aws-neuron-driver/APKBUILD @@ -5,7 +5,7 @@ # Todo: needs fix of https://github.com/aws-neuron/aws-neuron-sdk/issues/843 # pkgname=aws-neuron-driver -pkgver=2.15.9.0 +pkgver=2.16.7.0 pkgrel=0 pkgdesc="Linux Kernel module for AWS Neuron INF instances" url="https://awsdocs-neuron.readthedocs-hosted.com/en/latest/release-notes/index.html#" @@ -47,5 +47,5 @@ package() { } sha512sums=" -e0c6261a51ce847eb5b0d11c68345ae95ff45a9fecfd1d9a98f327436d369b48f7d4a7c38ffcf7a686b8d319a4ecdc5afd1e4bf946157f72d406daf8164207b7 aws-neuron-driver-2.15.9.0.deb +968eb60bcd6826fa7dba827c29eda0033c626e016c7a57389a821f64c966d076a85da885f772e937098885853fe50765013a1368aab8b0ca85d732c34e60a26e aws-neuron-driver-2.16.7.0.deb " diff --git a/kubezero/ecr-credential-provider/APKBUILD b/kubezero/ecr-credential-provider/APKBUILD index e41121b..fa1549b 100644 --- a/kubezero/ecr-credential-provider/APKBUILD +++ b/kubezero/ecr-credential-provider/APKBUILD @@ -15,7 +15,7 @@ builddir="$srcdir/cloud-provider-aws-$pkgver" build() { unset LDFLAGS # the default abuild LDFLAGS break the go linker - make GOFLAGS="-buildmode=pie -v" GOLDFLAGS="-extldflags=-static -w -s" ecr-credential-provider + make VERSION="v$pkgver" GOFLAGS="-buildmode=pie -v" GOLDFLAGS="-extldflags=-static -w -s" ecr-credential-provider } package() { diff --git a/kubezero/kubernetes/APKBUILD b/kubezero/kubernetes/APKBUILD index a79a530..57f310c 100644 --- a/kubezero/kubernetes/APKBUILD +++ b/kubezero/kubernetes/APKBUILD @@ -5,7 +5,7 @@ # Contributor: Dave # Maintainer: Stefan Reimer pkgname=kubernetes -pkgver=1.28.8 +pkgver=1.28.9 pkgrel=0 pkgdesc="Container Cluster Manager" url="https://kubernetes.io/" @@ -205,7 +205,7 @@ _do_zshcomp() { } sha512sums=" -2bbc48394784b34712c6b419cd07971780410223e7015c5fe6ed2c25c4e9499e81c9ea1f4269d399fd7e908971f5b8e873595d2b67332f7b49f61a5411a2aed1 kubernetes-1.28.8.tar.gz +cb10da770f8bb035c98b2c02b9ff202194ae69983d7c4d5052b03f5f5522e57f70a88105039265e1892039c566cfd7d043fcb44ad958823be0f5bee352f864a0 kubernetes-1.28.9.tar.gz 5427c2e653504cfd5b0bcaf195d4734ee40947ddfebc9f155cd96dddccfc27692c29d94af4ac99f1018925b52995c593b584c5d7a82df2f185ebce1a9e463c40 make-e2e_node-run-over-distro-bins.patch 94d07edfe7ca52b12e85dd9e29f4c9edcd144abc8d120fb71e2a0507f064afd4bac5dde30da7673a35bdd842b79a4770a03a1f3946bfae361c01dd4dc4903c64 make-test-cmd-run-over-hyperkube-based-kubectl.patch e690daff2adb1013c92124f32e71f8ed9a18c611ae6ae5fcb5ce9674768dbf9d911a05d7e4028488cda886e63b82e8ac0606d14389a05844c1b5538a33dd09d1 kube-apiserver.initd diff --git a/kubezero/kubezero/APKBUILD b/kubezero/kubezero/APKBUILD index b5a356d..ae92482 100644 --- a/kubezero/kubezero/APKBUILD +++ b/kubezero/kubezero/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stefan Reimer # Maintainer: Stefan Reimer pkgname=kubezero -pkgver=1.28.8 +pkgver=1.28.9 _crio=1.28.4 _ecr=1.28.1 diff --git a/kubezero/nvidia-container-toolkit/APKBUILD b/kubezero/nvidia-container-toolkit/APKBUILD index e707423..ecaf739 100644 --- a/kubezero/nvidia-container-toolkit/APKBUILD +++ b/kubezero/nvidia-container-toolkit/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Stefan Reimer # Maintainer: Stefan Reimer +# https://github.com/NVIDIA/nvidia-container-toolkit pkgname=nvidia-container-toolkit -pkgver=1.14.6 +pkgver=1.15.0 pkgrel=0 pkgdesc="NVIDIA Container toolkit incl. cri hooks" url="https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/overview.html" @@ -13,14 +14,16 @@ options="!check !tracedeps" _nv_ver="$pkgver"-1 _libcap=2.44-1 +_libseccomp=2.3.3-4 source="https://nvidia.github.io/libnvidia-container/stable/deb/amd64/libnvidia-container1_"$_nv_ver"_amd64.deb https://nvidia.github.io/libnvidia-container/stable/deb/amd64/libnvidia-container-tools_"$_nv_ver"_amd64.deb https://nvidia.github.io/libnvidia-container/stable/deb/amd64/nvidia-container-toolkit_"$_nv_ver"_amd64.deb - http://deb.debian.org/debian/pool/main/libc/libcap2/libcap2_"$_libcap"_amd64.deb - config.toml - oci-nvidia-hook.json - " + http://deb.debian.org/debian/pool/main/libs/libseccomp/libseccomp2_"$_libseccomp"_amd64.deb + http://deb.debian.org/debian/pool/main/libc/libcap2/libcap2_"$_libcap"_amd64.deb + config.toml + oci-nvidia-hook.json + " build() { return 0 @@ -49,6 +52,10 @@ package() { ar -x "$srcdir"/libcap2_"$_libcap"_amd64.deb && tar xfJ data.tar.xz mv lib/x86_64-linux-gnu/libcap.so.* "$pkgdir"/usr/glibc-compat/lib rm -rf control.tar.xz data.tar.xz debian-binary usr + # libseccomp + ar -x "$srcdir"/libseccomp2_"$_libseccomp"_amd64.deb && tar xfJ data.tar.xz + mv usr/lib/x86_64-linux-gnu/libseccomp.so.* "$pkgdir"/usr/glibc-compat/lib + rm -rf control.tar.xz data.tar.xz debian-binary usr # Now lets patch the elf binaries to fix library paths and order doas apk add patchelf@edge-community @@ -61,9 +68,10 @@ package() { } sha512sums=" -ac73361c10498cdb15e6facbc78867c576fe7a79e6e41e85eed57a24f49d35ec4d21663777549e30b62601e463a0a62e28a219daae13cf20fa9ac7b64bbc9daa libnvidia-container1_1.14.6-1_amd64.deb -08697b2133f198b056b6b5aade64574ee1e40ddbeaa5d73aa7b42642c6ac67a99ad8cc4a24465ef226a5596ddfed30fcf790ffe57d351c433869486269ba3ea3 libnvidia-container-tools_1.14.6-1_amd64.deb -bc8aaae2f6c7f93d307a3c11fe77db2b0a4dbc59b4c4ab46d4d655ee522edc6d0b2882b08034aaf5b007d889d661e368d28a379c53605c7da788660b4eba86f4 nvidia-container-toolkit_1.14.6-1_amd64.deb +36adc14f49b3827ba5b86fdf75b2eb91fd2b2621e9be3a02c2f7f94b2c30e47b9f9d7482ae4f788cee804b12b359e4dc597878171f6e68f7287c18b3d3dfdf8d libnvidia-container1_1.15.0-1_amd64.deb +686a642649104379710056740dd0e9004a20809729231d88557c85844fe83ea5b279fe6ac49e890bcc8727b050c285f4d1b2cba584b12be1158c5b7af48d27a3 libnvidia-container-tools_1.15.0-1_amd64.deb +f8507ca4d5b4678c6afaa271b5930f856d33d2ab92ed70fbd2a5047eb6fe7635f55758047117119f8656270d96667ddb154bb95074d58a34ad37ffb7832ce951 nvidia-container-toolkit_1.15.0-1_amd64.deb +5a4eaa96e6e774948889909d618a8ed44a82f649cbba11622dc7b4478098bea006995d5a5a60ca026a57b76ad866d1e2c6caebd154a26eb6bd7e15291b558057 libseccomp2_2.3.3-4_amd64.deb cc9109cdcf51dc40db732e10ac3eda7e4ac73299ad51d2ec619d7f4cff3f0311be0937530d2175e5486c393bc9e91c709072094fad510573785739afaad831f1 libcap2_2.44-1_amd64.deb 040ac2e3f58549dc09e5bce0d694e4be2f6aae736014bf0ee90042646562d5f1ef1f5990eb9f2c2a2fdf504587b82f4aa0eb99d04c5d3e407670e4012e3edd4e config.toml 0f150ea59b2372bf3ef60e657142b19f46500d1c70cb179d37ce117d6b03e86427dbf356873affb7639e082a07f852a922ae3aea4a8f8885640e43675c4e4add oci-nvidia-hook.json diff --git a/kubezero/nvidia-drivers/APKBUILD b/kubezero/nvidia-drivers/APKBUILD index 41fdeca..1af2541 100644 --- a/kubezero/nvidia-drivers/APKBUILD +++ b/kubezero/nvidia-drivers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stefan Reimer # Maintainer: Stefan Reimer pkgname=nvidia-drivers -pkgver=550.54.14 +pkgver=550.76 pkgrel=0 pkgdesc="NVIDIA Driver" url="https://www.nvidia.com/download/index.aspx" @@ -55,5 +55,5 @@ package() { } sha512sums=" -65fe0a3498e1b46368cfc7995fea720e4ba6373b0a74f4fc6280fbf75b2697948adf5b52b7d068b8df5ddbd347df7c0361db7e1a1fdc0d9fcfc6f478888936be NVIDIA-Linux-x86_64-550.54.14.run +a3804501b220d4acbda9633b92c4515bb14d0b5233f3ffd5e173290d310efdb1ed9a9602f727c117c1d0746d596c1125c51cc3e1fde65c79905e60e1d35f50ec NVIDIA-Linux-x86_64-550.76.run " diff --git a/kubezero/nvidia-open-gpu/APKBUILD b/kubezero/nvidia-open-gpu/APKBUILD index b5966a8..eea8a76 100644 --- a/kubezero/nvidia-open-gpu/APKBUILD +++ b/kubezero/nvidia-open-gpu/APKBUILD @@ -7,7 +7,7 @@ # remove coreutils from makedepends pkgname=nvidia-open-gpu -pkgver=550.54.15 +pkgver=550.76 pkgrel=0 pkgdesc="NVIDIA Linux open GPU kernel modules" url="https://github.com/NVIDIA/open-gpu-kernel-modules" @@ -53,7 +53,7 @@ package() { } sha512sums=" -54645a2c196a480e6da6740dd84784725fd81974bd59581dbcc21746244bd1d13910040dbea18cb0c40a41f6c586adb205d432ba452793bf430a3b721cca5f61 nvidia-550.54.15.tar.gz +5126d3b8e3f0635b5b044db4faf0d483e70bb43418bbd21325bb175aaca948e19bd81038fbef9118a95387da65ff0ff3d1592fc54c0d6815a2448b32024468ac nvidia-550.76.tar.gz b16b86ded8601ff802477e2b191c5728290014f90bb85ad6ec0e5b7e84f8004c467f5b6c66b80dc5d205fb70a3900ac286764a3829ca3ad3b8a3a5fd0b73a702 91-nvidia.rules 8335bd69c482da1f67b5cddd31a0b40d01b5c627aeca137b40ac7776cb3e7475767bec808a972ed739c26914207aca264324c41496f6fb579d910c8477f7cc1c create-nvidia-uvm-dev-node.sh "