github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 06:52:13 +00:00
Code Issues Projects Releases Wiki Activity

gpu: rootfs adjust for AGENT_INIT=no

Browse Source 
Since we're defaulting to AGENT_INIT=no for all the initrd/images
adapt the NV build to properly get kata-agent installed.

Signed-off-by: Zvonko Kaiser <zkaiser@nvidia.com>
This commit is contained in:
Zvonko Kaiser 2025-01-23 19:48:18 +00:00
parent 10974b7bec
commit cd7001612a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/osbuilder/rootfs-builder/nvidia/nvidia_rootfs.sh
View File

@ -253,15 +253,15 @@ chisseled_init() {
tar xvf "${BUILD_DIR}"/kata-static-busybox.tar.xz -C . tar xvf "${BUILD_DIR}"/kata-static-busybox.tar.xz -C .
mkdir -p dev etc proc run/cdi sys tmp usr var lib/modules lib/firmware \ mkdir -p dev etc proc run/cdi sys tmp usr var lib/modules lib/firmware \
usr/share/nvidia lib/x86_64-linux-gnu lib64 usr/share/nvidia lib/x86_64-linux-gnu lib64 usr/bin
ln -sf ../run var/run ln -sf ../run var/run
tar xvf "${BUILD_DIR}"/kata-static-nvidia-nvrc.tar.zst -C . tar xvf "${BUILD_DIR}"/kata-static-nvidia-nvrc.tar.zst -C .
ln -sf /bin/NVRC init ln -sf /bin/NVRC sbin/init
cp -a "${stage_one}"/sbin/init sbin/. cp -a "${stage_one}"/usr/bin/kata-agent usr/bin/.
cp -a "${stage_one}"/etc/kata-opa etc/. cp -a "${stage_one}"/etc/kata-opa etc/.
cp -a "${stage_one}"/etc/resolv.conf etc/. cp -a "${stage_one}"/etc/resolv.conf etc/.
cp -a "${stage_one}"/supported-gpu.devids . cp -a "${stage_one}"/supported-gpu.devids .

4
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@ -494,7 +494,6 @@ install_initrd_confidential() {
# Install NVIDIA GPU image # Install NVIDIA GPU image
install_image_nvidia_gpu() { install_image_nvidia_gpu() {
export AGENT_POLICY="yes" export AGENT_POLICY="yes"
export AGENT_INIT="no"
export EXTRA_PKGS="apt" export EXTRA_PKGS="apt"
NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute,dcgm"} NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute,dcgm"}
install_image "nvidia-gpu" install_image "nvidia-gpu"
@ -503,7 +502,6 @@ install_image_nvidia_gpu() {
# Install NVIDIA GPU initrd # Install NVIDIA GPU initrd
install_initrd_nvidia_gpu() { install_initrd_nvidia_gpu() {
export AGENT_POLICY="yes" export AGENT_POLICY="yes"
export AGENT_INIT="no"
export EXTRA_PKGS="apt" export EXTRA_PKGS="apt"
NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute,dcgm"} NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute,dcgm"}
install_initrd "nvidia-gpu" install_initrd "nvidia-gpu"
@ -512,7 +510,6 @@ install_initrd_nvidia_gpu() {
# Instal NVIDIA GPU confidential image # Instal NVIDIA GPU confidential image
install_image_nvidia_gpu_confidential() { install_image_nvidia_gpu_confidential() {
export AGENT_POLICY="yes" export AGENT_POLICY="yes"
export AGENT_INIT="no"
export EXTRA_PKGS="apt" export EXTRA_PKGS="apt"
# TODO: export MEASURED_ROOTFS=yes # TODO: export MEASURED_ROOTFS=yes
NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute"} NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute"}
@ -522,7 +519,6 @@ install_image_nvidia_gpu_confidential() {
# Install NVIDIA GPU confidential initrd # Install NVIDIA GPU confidential initrd
install_initrd_nvidia_gpu_confidential() { install_initrd_nvidia_gpu_confidential() {
export AGENT_POLICY="yes" export AGENT_POLICY="yes"
export AGENT_INIT="no"
export EXTRA_PKGS="apt" export EXTRA_PKGS="apt"
# TODO: export MEASURED_ROOTFS=yes # TODO: export MEASURED_ROOTFS=yes
NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute"} NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute"}