From 5eb7a35dc985427651deaf4775339abe52a4da80 Mon Sep 17 00:00:00 2001
From: ergosteur <1992147+ergosteur@users.noreply.github.com>
Date: Fri, 7 Aug 2026 15:56:03 +0000
Subject: [PATCH] Refresh cloud image version pins to current stable

Fedora was pinned to 41 and Alpine to 3.23.3, both two releases behind and
out of support. Nothing had broken yet, since Fedora 41 is still served from
releases/, but neither gets patches and both embed an exact release number in
the URL, so they 404 with no warning once the mirror rotates them out.

Alpine 3.23.3 to 3.24.1, Ubuntu 24.04 noble to 26.04 resolute, Fedora 41-1.4
to 44-1.7, AlmaLinux 9 to 10. Debian stays on trixie, still current stable
with forky in testing, and Arch is rolling.

Alpine also renamed the cloud image prefix from nocloud_ to generic_ in 3.24.
v3.24 carries only generic_ files, so bumping the pin alone would have 404'd
and the two changes cannot be separated. This does mean ALPINE_MAJOR can no
longer be rolled back to 3.23 or older without also reverting the prefix,
which the comment there records.

AlmaLinux 10 raises the CPU baseline to x86-64-v3, inherited from RHEL 10.
The script builds with --cpu host, so a template built on pre-Haswell
hardware will not boot. Fine on this host's Broadwell Xeons.

Every URL the script generates was checked by evaluating the pin block and
the case statement out of the script itself, rather than by hand: all six
return 200 with qcow2 magic and plausible sizes.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 build-cloudinit-template.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/build-cloudinit-template.sh b/build-cloudinit-template.sh
index d67db97..9332e67 100755
--- a/build-cloudinit-template.sh
+++ b/build-cloudinit-template.sh
@@ -32,15 +32,15 @@ if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
 fi
 
 # --- Distribution version pins (update these over time) ---
-ALPINE_MAJOR="v3.23"
-ALPINE_PATCH="3.23.3"
-UBUNTU_CODENAME="noble"
-UBUNTU_VER="2404"
+ALPINE_MAJOR="v3.24"
+ALPINE_PATCH="3.24.1"
+UBUNTU_CODENAME="resolute"   # 26.04 LTS
+UBUNTU_VER="2604"
 DEBIAN_CODENAME="trixie"
 DEBIAN_VER="13"
-FEDORA_VER="41"
-FEDORA_RELEASE="1.4"   # minor release can change throughout the cycle
-ALMA_VER="9"
+FEDORA_VER="44"
+FEDORA_RELEASE="1.7"   # minor release can change throughout the cycle
+ALMA_VER="10"
 # Arch is rolling, so it pulls the "latest" build natively.
 
 # --- Overridable configuration ---
@@ -121,7 +121,9 @@ fi
 case $DISTRO_CHOICE in
     alpine)
         VM_NAME="alpine-${ALPINE_MAJOR//v/}-cloudinit"
-        IMAGE_URL="https://dl-cdn.alpinelinux.org/alpine/${ALPINE_MAJOR}/releases/cloud/nocloud_alpine-${ALPINE_PATCH}-x86_64-uefi-cloudinit-r0.qcow2"
+        # Upstream renamed the cloud image prefix from nocloud_ to generic_ in 3.24;
+        # 3.23 and older only have nocloud_, so this URL is not backward-compatible.
+        IMAGE_URL="https://dl-cdn.alpinelinux.org/alpine/${ALPINE_MAJOR}/releases/cloud/generic_alpine-${ALPINE_PATCH}-x86_64-uefi-cloudinit-r0.qcow2"
         DEFAULT_DISK_SIZE="8G"
         PKG_MGR="apk"
         ;;