From a55630db5d8310407d7d4c4000c73fda3c31e35b Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Tue, 10 Sep 2024 21:05:28 +0200 Subject: [PATCH] Talos Linux: Update firmwares and add metal image Signed-off-by: Andrei Kvapil --- packages/core/installer/Makefile | 4 +-- packages/core/installer/hack/gen-profiles.sh | 6 ++--- .../images/talos/profiles/initramfs.yaml | 14 +++++----- .../images/talos/profiles/installer.yaml | 14 +++++----- .../installer/images/talos/profiles/iso.yaml | 14 +++++----- .../images/talos/profiles/kernel.yaml | 14 +++++----- .../images/talos/profiles/metal.yaml | 27 +++++++++++++++++++ .../images/talos/profiles/nocloud.yaml | 14 +++++----- 8 files changed, 67 insertions(+), 40 deletions(-) create mode 100644 packages/core/installer/images/talos/profiles/metal.yaml diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile index b5a5612f..edca0f8e 100644 --- a/packages/core/installer/Makefile +++ b/packages/core/installer/Makefile @@ -54,9 +54,9 @@ image-matchbox: --load=$(LOAD) rm -f images/matchbox.json -assets: talos-iso talos-nocloud +assets: talos-iso talos-nocloud talos-metal -talos-initramfs talos-kernel talos-installer talos-iso talos-nocloud: +talos-initramfs talos-kernel talos-installer talos-iso talos-nocloud talos-metal: mkdir -p ../../../_out/assets cat images/talos/profiles/$(subst talos-,,$@).yaml | \ docker run --rm -i -v /dev:/dev --privileged "ghcr.io/siderolabs/imager:$(TALOS_VERSION)" --tar-to-stdout - | \ diff --git a/packages/core/installer/hack/gen-profiles.sh b/packages/core/installer/hack/gen-profiles.sh index 3a8ec82a..64880fb3 100755 --- a/packages/core/installer/hack/gen-profiles.sh +++ b/packages/core/installer/hack/gen-profiles.sh @@ -2,7 +2,7 @@ set -e set -u -PROFILES="initramfs kernel iso installer nocloud" +PROFILES="initramfs kernel iso installer nocloud metal" FIRMWARES="amd-ucode amdgpu-firmware bnx2-bnx2x i915-ucode intel-ice-firmware intel-ucode qlogic-firmware" EXTENSIONS="drbd zfs" @@ -32,10 +32,10 @@ done for profile in $PROFILES; do echo "writing profile images/talos/profiles/$profile.yaml" - if [ "$profile" = "nocloud" ]; then + if [ "$profile" = "nocloud" ] || [ "$profile" = "metal" ]; then image_options="{ diskSize: 1306525696, diskFormat: raw }" out_format=".xz" - platform="nocloud" + platform="$profile" kind="image" else image_options="{}" diff --git a/packages/core/installer/images/talos/profiles/initramfs.yaml b/packages/core/installer/images/talos/profiles/initramfs.yaml index ffe4782e..a825eb81 100644 --- a/packages/core/installer/images/talos/profiles/initramfs.yaml +++ b/packages/core/installer/images/talos/profiles/initramfs.yaml @@ -12,13 +12,13 @@ input: baseInstaller: imageRef: ghcr.io/siderolabs/installer:v1.7.6 systemExtensions: - - imageRef: ghcr.io/siderolabs/amd-ucode:20240709 - - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240709 - - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240709 - - imageRef: ghcr.io/siderolabs/i915-ucode:20240709 - - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240709 - - imageRef: ghcr.io/siderolabs/intel-ucode:20240531 - - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240709 + - imageRef: ghcr.io/siderolabs/amd-ucode:20240811 + - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240811 + - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240811 + - imageRef: ghcr.io/siderolabs/i915-ucode:20240811 + - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240811 + - imageRef: ghcr.io/siderolabs/intel-ucode:20240813 + - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240811 - imageRef: ghcr.io/siderolabs/drbd:9.2.8-v1.7.6 - imageRef: ghcr.io/siderolabs/zfs:2.2.4-v1.7.6 output: diff --git a/packages/core/installer/images/talos/profiles/installer.yaml b/packages/core/installer/images/talos/profiles/installer.yaml index a5c93a39..8183557f 100644 --- a/packages/core/installer/images/talos/profiles/installer.yaml +++ b/packages/core/installer/images/talos/profiles/installer.yaml @@ -12,13 +12,13 @@ input: baseInstaller: imageRef: ghcr.io/siderolabs/installer:v1.7.6 systemExtensions: - - imageRef: ghcr.io/siderolabs/amd-ucode:20240709 - - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240709 - - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240709 - - imageRef: ghcr.io/siderolabs/i915-ucode:20240709 - - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240709 - - imageRef: ghcr.io/siderolabs/intel-ucode:20240531 - - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240709 + - imageRef: ghcr.io/siderolabs/amd-ucode:20240811 + - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240811 + - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240811 + - imageRef: ghcr.io/siderolabs/i915-ucode:20240811 + - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240811 + - imageRef: ghcr.io/siderolabs/intel-ucode:20240813 + - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240811 - imageRef: ghcr.io/siderolabs/drbd:9.2.8-v1.7.6 - imageRef: ghcr.io/siderolabs/zfs:2.2.4-v1.7.6 output: diff --git a/packages/core/installer/images/talos/profiles/iso.yaml b/packages/core/installer/images/talos/profiles/iso.yaml index c6c4e4e6..f673e1e3 100644 --- a/packages/core/installer/images/talos/profiles/iso.yaml +++ b/packages/core/installer/images/talos/profiles/iso.yaml @@ -12,13 +12,13 @@ input: baseInstaller: imageRef: ghcr.io/siderolabs/installer:v1.7.6 systemExtensions: - - imageRef: ghcr.io/siderolabs/amd-ucode:20240709 - - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240709 - - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240709 - - imageRef: ghcr.io/siderolabs/i915-ucode:20240709 - - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240709 - - imageRef: ghcr.io/siderolabs/intel-ucode:20240531 - - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240709 + - imageRef: ghcr.io/siderolabs/amd-ucode:20240811 + - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240811 + - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240811 + - imageRef: ghcr.io/siderolabs/i915-ucode:20240811 + - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240811 + - imageRef: ghcr.io/siderolabs/intel-ucode:20240813 + - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240811 - imageRef: ghcr.io/siderolabs/drbd:9.2.8-v1.7.6 - imageRef: ghcr.io/siderolabs/zfs:2.2.4-v1.7.6 output: diff --git a/packages/core/installer/images/talos/profiles/kernel.yaml b/packages/core/installer/images/talos/profiles/kernel.yaml index c0cf8c6f..421d017b 100644 --- a/packages/core/installer/images/talos/profiles/kernel.yaml +++ b/packages/core/installer/images/talos/profiles/kernel.yaml @@ -12,13 +12,13 @@ input: baseInstaller: imageRef: ghcr.io/siderolabs/installer:v1.7.6 systemExtensions: - - imageRef: ghcr.io/siderolabs/amd-ucode:20240709 - - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240709 - - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240709 - - imageRef: ghcr.io/siderolabs/i915-ucode:20240709 - - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240709 - - imageRef: ghcr.io/siderolabs/intel-ucode:20240531 - - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240709 + - imageRef: ghcr.io/siderolabs/amd-ucode:20240811 + - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240811 + - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240811 + - imageRef: ghcr.io/siderolabs/i915-ucode:20240811 + - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240811 + - imageRef: ghcr.io/siderolabs/intel-ucode:20240813 + - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240811 - imageRef: ghcr.io/siderolabs/drbd:9.2.8-v1.7.6 - imageRef: ghcr.io/siderolabs/zfs:2.2.4-v1.7.6 output: diff --git a/packages/core/installer/images/talos/profiles/metal.yaml b/packages/core/installer/images/talos/profiles/metal.yaml new file mode 100644 index 00000000..faaff221 --- /dev/null +++ b/packages/core/installer/images/talos/profiles/metal.yaml @@ -0,0 +1,27 @@ +# this file generated by hack/gen-profiles.sh +# do not edit it +arch: amd64 +platform: metal +secureboot: false +version: v1.7.6 +input: + kernel: + path: /usr/install/amd64/vmlinuz + initramfs: + path: /usr/install/amd64/initramfs.xz + baseInstaller: + imageRef: ghcr.io/siderolabs/installer:v1.7.6 + systemExtensions: + - imageRef: ghcr.io/siderolabs/amd-ucode:20240811 + - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240811 + - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240811 + - imageRef: ghcr.io/siderolabs/i915-ucode:20240811 + - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240811 + - imageRef: ghcr.io/siderolabs/intel-ucode:20240813 + - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240811 + - imageRef: ghcr.io/siderolabs/drbd:9.2.8-v1.7.6 + - imageRef: ghcr.io/siderolabs/zfs:2.2.4-v1.7.6 +output: + kind: image + imageOptions: { diskSize: 1306525696, diskFormat: raw } + outFormat: .xz diff --git a/packages/core/installer/images/talos/profiles/nocloud.yaml b/packages/core/installer/images/talos/profiles/nocloud.yaml index 9fb5c2b0..ba0a9e06 100644 --- a/packages/core/installer/images/talos/profiles/nocloud.yaml +++ b/packages/core/installer/images/talos/profiles/nocloud.yaml @@ -12,13 +12,13 @@ input: baseInstaller: imageRef: ghcr.io/siderolabs/installer:v1.7.6 systemExtensions: - - imageRef: ghcr.io/siderolabs/amd-ucode:20240709 - - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240709 - - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240709 - - imageRef: ghcr.io/siderolabs/i915-ucode:20240709 - - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240709 - - imageRef: ghcr.io/siderolabs/intel-ucode:20240531 - - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240709 + - imageRef: ghcr.io/siderolabs/amd-ucode:20240811 + - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20240811 + - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20240811 + - imageRef: ghcr.io/siderolabs/i915-ucode:20240811 + - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20240811 + - imageRef: ghcr.io/siderolabs/intel-ucode:20240813 + - imageRef: ghcr.io/siderolabs/qlogic-firmware:20240811 - imageRef: ghcr.io/siderolabs/drbd:9.2.8-v1.7.6 - imageRef: ghcr.io/siderolabs/zfs:2.2.4-v1.7.6 output: