Compare commits

...

2 Commits

Author SHA1 Message Date
Andrei Kvapil
942b636f68 Add secureboot support 2025-01-03 00:53:12 +01:00
Andrei Kvapil
c6edf6cb9e Update Talos v1.9.1
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
2024-12-31 17:36:31 +01:00
8 changed files with 42 additions and 32 deletions

View File

@@ -113,8 +113,6 @@ machine:
- usermode_helper=disabled - usermode_helper=disabled
- name: zfs - name: zfs
- name: spl - name: spl
install:
image: ghcr.io/aenix-io/cozystack/talos:v1.8.4
files: files:
- content: | - content: |
[plugins] [plugins]

View File

@@ -38,8 +38,8 @@ image-cozystack:
rm -f images/cozystack.json rm -f images/cozystack.json
image-talos: image-talos:
test -f ../../../_out/assets/installer-amd64.tar || make talos-installer test -f ../../../_out/assets/installer-amd64-secureboot.tar || make talos-installer
docker load -i ../../../_out/assets/installer-amd64.tar docker load -i ../../../_out/assets/installer-amd64-secureboot.tar
docker tag ghcr.io/siderolabs/installer:$(TALOS_VERSION) $(REGISTRY)/talos:$(call settag,$(TALOS_VERSION)) docker tag ghcr.io/siderolabs/installer:$(TALOS_VERSION) $(REGISTRY)/talos:$(call settag,$(TALOS_VERSION))
docker push $(REGISTRY)/talos:$(call settag,$(TALOS_VERSION)) docker push $(REGISTRY)/talos:$(call settag,$(TALOS_VERSION))
@@ -59,8 +59,17 @@ image-matchbox:
assets: talos-iso talos-nocloud talos-metal assets: talos-iso talos-nocloud talos-metal
talos-initramfs talos-kernel talos-installer talos-iso talos-nocloud talos-metal: talos-initramfs talos-kernel talos-installer talos-iso talos-nocloud talos-metal: secureboot-keys
mkdir -p ../../../_out/assets mkdir -p ../../../_out/assets
docker rm -f talos-imager 2>/dev/null || true
docker run -d --rm --name talos-imager --privileged -v /dev:/dev --entrypoint=/bin/sleep "ghcr.io/siderolabs/imager:$(TALOS_VERSION)" infinity
docker cp ../../../_out/secureboot talos-imager:/secureboot && \
cat images/talos/profiles/$(subst talos-,,$@).yaml | \ cat images/talos/profiles/$(subst talos-,,$@).yaml | \
docker run --rm -i -v /dev:/dev --privileged "ghcr.io/siderolabs/imager:$(TALOS_VERSION)" --tar-to-stdout - | \ docker exec -i talos-imager /bin/imager --tar-to-stdout - | \
tar -C ../../../_out/assets -xzf- tar -C ../../../_out/assets -xzf- ; \
docker rm -f talos-imager
secureboot-keys:
test -d ../../../_out/secureboot || ( \
talosctl gen secureboot uki --common-name "SecureBoot Key" -o ../../../_out/secureboot/ && \
talosctl gen secureboot pcr -o ../../../_out/secureboot/ )

View File

@@ -3,14 +3,14 @@
arch: amd64 arch: amd64
platform: metal platform: metal
secureboot: false secureboot: false
version: v1.8.4 version: v1.9.1
input: input:
kernel: kernel:
path: /usr/install/amd64/vmlinuz path: /usr/install/amd64/vmlinuz
initramfs: initramfs:
path: /usr/install/amd64/initramfs.xz path: /usr/install/amd64/initramfs.xz
baseInstaller: baseInstaller:
imageRef: ghcr.io/siderolabs/installer:v1.8.4 imageRef: ghcr.io/siderolabs/installer:v1.9.1
systemExtensions: systemExtensions:
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210 - imageRef: ghcr.io/siderolabs/amd-ucode:20241210
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110 - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210 - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112 - imageRef: ghcr.io/siderolabs/intel-ucode:20241112
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210 - imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4 - imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4 - imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
output: output:
kind: initramfs kind: initramfs
imageOptions: {} imageOptions: {}

View File

@@ -2,15 +2,15 @@
# do not edit it # do not edit it
arch: amd64 arch: amd64
platform: metal platform: metal
secureboot: false version: v1.9.1
version: v1.8.4 secureboot: true
input: input:
kernel: kernel:
path: /usr/install/amd64/vmlinuz path: /usr/install/amd64/vmlinuz
initramfs: initramfs:
path: /usr/install/amd64/initramfs.xz path: /usr/install/amd64/initramfs.xz
baseInstaller: baseInstaller:
imageRef: ghcr.io/siderolabs/installer:v1.8.4 imageRef: ghcr.io/siderolabs/installer:v1.9.1
systemExtensions: systemExtensions:
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210 - imageRef: ghcr.io/siderolabs/amd-ucode:20241210
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110 - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,9 +19,12 @@ input:
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210 - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112 - imageRef: ghcr.io/siderolabs/intel-ucode:20241112
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210 - imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4 - imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4 - imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
output: output:
kind: installer kind: installer
imageOptions: {} imageOptions: {}
outFormat: raw outFormat: raw
customization:
extraKernelArgs:
- -selinux

View File

@@ -3,14 +3,14 @@
arch: amd64 arch: amd64
platform: metal platform: metal
secureboot: false secureboot: false
version: v1.8.4 version: v1.9.1
input: input:
kernel: kernel:
path: /usr/install/amd64/vmlinuz path: /usr/install/amd64/vmlinuz
initramfs: initramfs:
path: /usr/install/amd64/initramfs.xz path: /usr/install/amd64/initramfs.xz
baseInstaller: baseInstaller:
imageRef: ghcr.io/siderolabs/installer:v1.8.4 imageRef: ghcr.io/siderolabs/installer:v1.9.1
systemExtensions: systemExtensions:
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210 - imageRef: ghcr.io/siderolabs/amd-ucode:20241210
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110 - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210 - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112 - imageRef: ghcr.io/siderolabs/intel-ucode:20241112
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210 - imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4 - imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4 - imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
output: output:
kind: iso kind: iso
imageOptions: {} imageOptions: {}

View File

@@ -3,14 +3,14 @@
arch: amd64 arch: amd64
platform: metal platform: metal
secureboot: false secureboot: false
version: v1.8.4 version: v1.9.1
input: input:
kernel: kernel:
path: /usr/install/amd64/vmlinuz path: /usr/install/amd64/vmlinuz
initramfs: initramfs:
path: /usr/install/amd64/initramfs.xz path: /usr/install/amd64/initramfs.xz
baseInstaller: baseInstaller:
imageRef: ghcr.io/siderolabs/installer:v1.8.4 imageRef: ghcr.io/siderolabs/installer:v1.9.1
systemExtensions: systemExtensions:
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210 - imageRef: ghcr.io/siderolabs/amd-ucode:20241210
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110 - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210 - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112 - imageRef: ghcr.io/siderolabs/intel-ucode:20241112
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210 - imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4 - imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4 - imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
output: output:
kind: kernel kind: kernel
imageOptions: {} imageOptions: {}

View File

@@ -3,14 +3,14 @@
arch: amd64 arch: amd64
platform: metal platform: metal
secureboot: false secureboot: false
version: v1.8.4 version: v1.9.1
input: input:
kernel: kernel:
path: /usr/install/amd64/vmlinuz path: /usr/install/amd64/vmlinuz
initramfs: initramfs:
path: /usr/install/amd64/initramfs.xz path: /usr/install/amd64/initramfs.xz
baseInstaller: baseInstaller:
imageRef: ghcr.io/siderolabs/installer:v1.8.4 imageRef: ghcr.io/siderolabs/installer:v1.9.1
systemExtensions: systemExtensions:
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210 - imageRef: ghcr.io/siderolabs/amd-ucode:20241210
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110 - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210 - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112 - imageRef: ghcr.io/siderolabs/intel-ucode:20241112
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210 - imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4 - imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4 - imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
output: output:
kind: image kind: image
imageOptions: { diskSize: 1306525696, diskFormat: raw } imageOptions: { diskSize: 1306525696, diskFormat: raw }

View File

@@ -3,14 +3,14 @@
arch: amd64 arch: amd64
platform: nocloud platform: nocloud
secureboot: false secureboot: false
version: v1.8.4 version: v1.9.1
input: input:
kernel: kernel:
path: /usr/install/amd64/vmlinuz path: /usr/install/amd64/vmlinuz
initramfs: initramfs:
path: /usr/install/amd64/initramfs.xz path: /usr/install/amd64/initramfs.xz
baseInstaller: baseInstaller:
imageRef: ghcr.io/siderolabs/installer:v1.8.4 imageRef: ghcr.io/siderolabs/installer:v1.9.1
systemExtensions: systemExtensions:
- imageRef: ghcr.io/siderolabs/amd-ucode:20241210 - imageRef: ghcr.io/siderolabs/amd-ucode:20241210
- imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110 - imageRef: ghcr.io/siderolabs/amdgpu-firmware:20241110
@@ -19,8 +19,8 @@ input:
- imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210 - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20241210
- imageRef: ghcr.io/siderolabs/intel-ucode:20241112 - imageRef: ghcr.io/siderolabs/intel-ucode:20241112
- imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210 - imageRef: ghcr.io/siderolabs/qlogic-firmware:20241210
- imageRef: ghcr.io/siderolabs/drbd:9.2.11-v1.8.4 - imageRef: ghcr.io/siderolabs/drbd:9.2.12-v1.9.1
- imageRef: ghcr.io/siderolabs/zfs:2.2.6-v1.8.4 - imageRef: ghcr.io/kvaps/talos/zfs:2.2.7-v1.9.1-2-gc043c0a
output: output:
kind: image kind: image
imageOptions: { diskSize: 1306525696, diskFormat: raw } imageOptions: { diskSize: 1306525696, diskFormat: raw }