mirror of
https://github.com/mulgadc/spinifex.git
synced 2026-10-15 17:11:30 +00:00
6389b37433
* fix(eks): GPU node AMI declares uefi boot mode The spinifex-eks-node-gpu catalog entry declared BootMode: bios, but the Ubuntu 26.04 GPU appliance image is built GPT/EFI-only. Under legacy BIOS no OVMF/pflash firmware is attached, so the guest hangs at firmware with zero serial console output. * fix(images): install open-kernel NVIDIA DKMS driver for Blackwell GPUs Blackwell-generation GPUs (e.g. RTX Pro 6000 Blackwell) refuse to initialize under the closed/proprietary kernel module: dmesg shows RmInitAdapter failing with "requires use of the NVIDIA open kernel modules" (NVRM error 0x22). Switch from nvidia-dkms-<ver>-server to nvidia-dkms-<ver>-server-open in both the shared ubuntu-gpu-nvidia recipe and its verbatim duplicate in eks-node-gpu. nvidia-utils has no separate open variant (userspace tools only), so it is unchanged. * fix(eks): tolerate CP and GPU taints in ebs-csi-controller/lbc addons A cluster with a GPU-only nodegroup has no untainted node: the CP carries CriticalAddonsOnly (EKS parity keeps user workloads off it) and every worker carries nvidia.com/gpu. Without tolerations for both, ebs-csi-controller and aws-load-balancer-controller have nowhere to schedule and stay Pending forever. Real EKS never needs this since its control plane isn't a schedulable node, so the stock upstream manifests carry no such toleration. * fix(images): give the libguestfs appliance a working resolver The guest's /etc/resolv.conf symlinks to systemd-resolved's stub (127.0.0.53), which isn't running inside the appliance chroot, so DNS is dead until package installs need it. Point it at a real resolver before package installs, then restore the stub symlink afterward so the shipped AMI still gets its DNS from systemd-resolved at boot like a stock cloud image. * fix(gpu): skip upstream PCIe bridge devices during VFIO bind/unbind A GPU's IOMMU group can include an upstream PCIe bridge when the platform lacks ACS isolation between them. vfio-pci refuses to bind non-endpoint bridge devices, so Claim/ReclaimByAddress must filter bridge-class (0x06) members out of the group before touching driver bindings, rather than failing the whole claim or leaving the bridge rebound incorrectly. * fix(ecs): GPU node AMI declares uefi boot mode The spinifex-ecs-node-gpu catalog entry declared BootMode: bios, but the Ubuntu 26.04 GPU appliance image is built GPT/EFI-only. Under legacy BIOS no OVMF/pflash firmware is attached, so the guest hangs at firmware with zero serial console output. Same defect and same fix as the eks-node-gpu entry: both images are built by the same script from the same stock Ubuntu cloudimg, so both were EFI-only and only one was corrected. * fix(images): open-kernel NVIDIA module on ecs-agent-gpu, pin driver branch ecs-agent-gpu still installed nvidia-dkms-<N>-server, the proprietary kernel module. NVIDIA ships no proprietary module for Blackwell (GB202) and later, so ECS GPU container-instances could not bind those cards on any driver branch. It is the third verbatim copy of the routine and was missed when the other two were fixed. Also pins the driver branch across all three copies. The branch was resolved at build time via apt-cache search | sort -rn | head -1, which sorts on the number in the package name — but that number is a branch alias, not a driver version (nvidia-dkms-535-server installs 580.126.20), so the ordering key need not match what installs. Resolving also let identical source produce different drivers on different days. The pin lives in setup.sh rather than manifest.conf because manifest variables are not passed into the guest: the setup script is uploaded and executed by virt-customize --run, with no environment carried across. * fix(eks): tolerate CP and GPU taints in argocd addon All six argocd Deployments and its StatefulSet carried no tolerations. A cluster with a GPU-only nodegroup has no untainted node to place them on: the control plane carries CriticalAddonsOnly and every worker carries nvidia.com/gpu, so the pods stay Pending forever. Same defect the ebs-csi-controller and load-balancer-controller addons already had. Real EKS never hits it because its control plane is not a schedulable node, so the stock upstream manifests carry no such toleration and the divergence is ours to maintain. --------- Co-authored-by: joshsiv-mulga <mrk@mulgadc.com>
159 lines
7.9 KiB
Bash
159 lines
7.9 KiB
Bash
#!/bin/sh
|
|
set -eu
|
|
|
|
# setup.sh — guest customisation for the ecs-agent-gpu AMI (Ubuntu ECS GPU
|
|
# container-instance).
|
|
#
|
|
# Runs inside the libguestfs appliance (via virt-customize --run) under
|
|
# build-system-image.sh, after packages, binaries and INSTALL_FILES are
|
|
# placed. Wires the CNI bin path containerd's CRI plugin expects (mirroring
|
|
# scripts/images/ecs-agent/setup.sh, but Ubuntu's containernetworking-plugins
|
|
# package lays out differently to Alpine's — see below), preps the containerd
|
|
# content store + agent config dir, and bakes the headless NVIDIA driver +
|
|
# nvidia-container-toolkit (steps reused from
|
|
# scripts/images/ubuntu-gpu-nvidia-setup.sh — see install_nvidia_gpu_stack()
|
|
# below, duplicated verbatim from scripts/images/eks-node-gpu/setup.sh so
|
|
# both GPU node images stay consistent; each image builds standalone from
|
|
# its own manifest so there is no shared-script mechanism to source from).
|
|
#
|
|
# Unlike scripts/images/ecs-agent/setup.sh there is no chmod dance for OpenRC
|
|
# init scripts (systemd unit files don't need an exec bit) and no SYSLINUX/
|
|
# serial-console tweaks (Ubuntu boots via GRUB/UEFI, not Alpine's extlinux).
|
|
|
|
# Ubuntu's containernetworking-plugins package installs plugin binaries
|
|
# directly under /usr/lib/cni (verified via `dpkg -L containernetworking-plugins`
|
|
# — no /bin subdir, unlike Alpine's /usr/libexec/cni). containerd's CRI plugin
|
|
# defaults its bin dir to /opt/cni/bin. Symlink so the baked bridge conflist
|
|
# resolves its plugins when task networking is wired up.
|
|
mkdir -p /opt/cni
|
|
ln -sf /usr/lib/cni /opt/cni/bin
|
|
|
|
# Content-store + agent config dirs.
|
|
mkdir -p /var/lib/containerd /etc/spinifex-ecs
|
|
|
|
# ── NVIDIA headless driver + container toolkit (node-image subset) ──────────
|
|
# Reused from scripts/images/ubuntu-gpu-nvidia-setup.sh: kernel detection,
|
|
# linux-headers-<kver>, the latest versioned nvidia-dkms-<ver>-server +
|
|
# nvidia-utils-<ver>-server, `dkms install`, nvidia.ko verification,
|
|
# `apt-mark hold` on the kernel/nvidia/libnvidia packages, the nouveau
|
|
# modprobe blacklist, and `update-initramfs -u -k <kver>`.
|
|
#
|
|
# Dropped for a node image: pciutils/python3/git/curl-extras/htop/tmux/ffmpeg/
|
|
# libgl1/libglib dev payload, and Docker CE entirely — GPU nodes run
|
|
# containerd (this image) or k3s (scripts/images/eks-node-gpu), never Docker.
|
|
# `nvidia-ctk runtime configure --runtime=docker` and the docker-group
|
|
# cloud-init drop-in are dropped for the same reason; the runtime is instead
|
|
# wired via CDI at first boot by mulga-cdi-generate.service, gated on an
|
|
# NVIDIA GPU actually being present.
|
|
install_nvidia_gpu_stack() {
|
|
KVER=$(ls /boot/vmlinuz-* 2>/dev/null | sort -V | tail -1 | sed 's|/boot/vmlinuz-||') || true
|
|
if [ -z "${KVER}" ]; then
|
|
# Ubuntu 26.04 minimal cloud image keeps the kernel on the ESP (not
|
|
# mounted in the appliance chroot), so /boot is empty — fall back to
|
|
# /lib/modules.
|
|
KVER=$(ls /lib/modules/ 2>/dev/null | sort -V | tail -1)
|
|
fi
|
|
if [ -z "${KVER}" ]; then
|
|
echo "ERROR: No kernel found in /boot or /lib/modules — base image may be missing a kernel"
|
|
exit 1
|
|
fi
|
|
echo "[nvidia-gpu-stack] target kernel: ${KVER}"
|
|
|
|
# Prevent kernel postinst hooks from attempting grub-install against the
|
|
# host disk — this fails silently inside the appliance and can abort the
|
|
# postinst, leaving /boot incomplete.
|
|
cat > /etc/kernel-img.conf <<'EOF'
|
|
do_symlinks = yes
|
|
do_bootloader = no
|
|
do_initrd = yes
|
|
link_in_boot = yes
|
|
EOF
|
|
|
|
apt-get install -y --no-install-recommends "linux-headers-${KVER}"
|
|
|
|
# Ubuntu 26.04+ no longer ships unversioned meta-packages, so the branch is
|
|
# named explicitly. Pinned rather than resolved at build time: the number in
|
|
# the package name is a branch alias, not a driver version (nvidia-dkms-535-server
|
|
# installs 580.126.20), so picking the highest number sorts on a value that
|
|
# need not match what gets installed. Resolving also let identical source
|
|
# produce different drivers on different days. Bumping is a deliberate edit.
|
|
NVIDIA_VER=595
|
|
echo "[nvidia-gpu-stack] installing NVIDIA server driver branch: ${NVIDIA_VER}"
|
|
# The -open (GSP/open-kernel-module) DKMS variant, not the closed/proprietary
|
|
# one: Blackwell-generation GPUs (e.g. RTX Pro 6000 Blackwell) refuse to
|
|
# initialize under the closed kernel module — RmInitAdapter fails with
|
|
# "requires use of the NVIDIA open kernel modules" (dmesg NVRM error 0x22).
|
|
# nvidia-utils has no separate open variant (userspace tools only).
|
|
apt-get install -y --no-install-recommends \
|
|
"nvidia-dkms-${NVIDIA_VER}-server-open" \
|
|
"nvidia-utils-${NVIDIA_VER}-server"
|
|
|
|
NVIDIA_DKMS_NAME=$(dkms status 2>/dev/null | awk -F'[,/ ]+' '/nvidia/{print $1; exit}')
|
|
NVIDIA_DKMS_VER=$(dkms status 2>/dev/null | awk -F'[,/ ]+' '/nvidia/{print $2; exit}')
|
|
if [ -n "${NVIDIA_DKMS_NAME}" ] && [ -n "${NVIDIA_DKMS_VER}" ]; then
|
|
echo "[nvidia-gpu-stack] building NVIDIA DKMS module ${NVIDIA_DKMS_NAME}/${NVIDIA_DKMS_VER} for kernel ${KVER}..."
|
|
dkms install -m "${NVIDIA_DKMS_NAME}" -v "${NVIDIA_DKMS_VER}" --kernelver "${KVER}" --force
|
|
else
|
|
echo "WARNING: nvidia DKMS module not found in dkms status — driver install may have failed"
|
|
fi
|
|
|
|
NVIDIA_KO=$(find "/lib/modules/${KVER}/updates" -name "nvidia.ko*" 2>/dev/null | head -1)
|
|
if [ -z "${NVIDIA_KO}" ]; then
|
|
echo "ERROR: nvidia.ko not found under /lib/modules/${KVER}/updates after DKMS build"
|
|
exit 1
|
|
fi
|
|
echo "[nvidia-gpu-stack] NVIDIA kernel module: ${NVIDIA_KO}"
|
|
|
|
# Pin the exact kernel + headers + nvidia/libnvidia packages so
|
|
# unattended-upgrades cannot replace what the DKMS module was built for.
|
|
apt-mark hold "linux-image-${KVER}" "linux-headers-${KVER}"
|
|
|
|
NVIDIA_PKGS=$(dpkg --get-selections 'nvidia-*' 2>/dev/null | awk '/install$/{print $1}' || true)
|
|
LIBNVIDIA_PKGS=$(dpkg --get-selections 'libnvidia-*' 2>/dev/null | awk '/install$/{print $1}' || true)
|
|
# shellcheck disable=SC2086
|
|
[ -n "${NVIDIA_PKGS}" ] && apt-mark hold ${NVIDIA_PKGS}
|
|
# shellcheck disable=SC2086
|
|
[ -n "${LIBNVIDIA_PKGS}" ] && apt-mark hold ${LIBNVIDIA_PKGS}
|
|
|
|
# nvidia.ko and nouveau conflict; without this the NVIDIA driver will not
|
|
# bind after boot.
|
|
cat > /etc/modprobe.d/blacklist-nouveau.conf <<'EOF'
|
|
blacklist nouveau
|
|
options nouveau modeset=0
|
|
EOF
|
|
|
|
# Load the NVIDIA modules at boot so /dev/nvidia* exist before CDI
|
|
# generation and the container runtime start — a headless node never runs
|
|
# an X server or CUDA app to trigger the on-demand load.
|
|
cat > /etc/modules-load.d/nvidia.conf <<'EOF'
|
|
nvidia
|
|
nvidia_uvm
|
|
nvidia_modeset
|
|
EOF
|
|
|
|
# nvidia-container-toolkit lives in its own NVIDIA-hosted apt repo, which
|
|
# is not enabled on the base Ubuntu cloud image — add it here (same
|
|
# gpg key + list as scripts/images/ubuntu-gpu-nvidia-setup.sh) and
|
|
# install only the headless toolkit (no Docker CE).
|
|
apt-get install -y --no-install-recommends gnupg
|
|
mkdir -p /usr/share/keyrings /etc/apt/sources.list.d
|
|
curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey \
|
|
| gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg
|
|
curl -fsSL https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list \
|
|
| sed 's|deb https://|deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://|g' \
|
|
> /etc/apt/sources.list.d/nvidia-container-toolkit.list
|
|
apt-get update -qq
|
|
apt-get install -y --no-install-recommends nvidia-container-toolkit
|
|
apt-mark hold nvidia-container-toolkit nvidia-container-toolkit-base \
|
|
libnvidia-container1 libnvidia-container-tools 2>/dev/null || true
|
|
|
|
# Rebuild initramfs with nouveau blacklisted and the NVIDIA module included.
|
|
update-initramfs -u -k "${KVER}"
|
|
|
|
echo "[nvidia-gpu-stack] done: kernel=${KVER}, NVIDIA headless driver + nvidia-container-toolkit installed"
|
|
}
|
|
|
|
install_nvidia_gpu_stack
|
|
|
|
echo "[ecs-agent-gpu-setup] done"
|