diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 01837780e..d45dae657 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-02-16T17:00:53Z by kres 8a48729. +# Generated on 2025-02-27T15:41:51Z by kres 1281806. name: default concurrency: @@ -92,7 +92,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: lint run: | make lint @@ -107,6 +107,7 @@ jobs: - name: images-essential env: IMAGE_REGISTRY: registry.dev.siderolabs.io + IMAGER_ARGS: --extra-kernel-arg=console=ttyS0 PLATFORM: linux/amd64,linux/arm64 run: | make images-essential @@ -442,7 +443,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -576,7 +577,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -730,7 +731,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -880,7 +881,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -1005,7 +1006,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -1133,7 +1134,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: images env: IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1215,7 +1216,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -1313,7 +1314,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -1447,7 +1448,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -1666,7 +1667,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -1848,7 +1849,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -1931,7 +1932,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -2058,7 +2059,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -2186,7 +2187,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -2332,7 +2333,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -2442,7 +2443,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -2571,7 +2572,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -2666,7 +2667,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -2761,7 +2762,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -2856,7 +2857,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -2958,7 +2959,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -3091,7 +3092,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -3199,7 +3200,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -3306,7 +3307,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -3404,7 +3405,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -3417,7 +3418,7 @@ jobs: TAG_SUFFIX: -race WITH_RACE: "1" run: | - make initramfs installer + make initramfs installer-base - name: e2e-qemu-race env: GITHUB_STEP_NAME: ${{ github.job}}-e2e-qemu-race @@ -3588,7 +3589,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -3680,7 +3681,7 @@ jobs: env: PLATFORM: linux/amd64,linux/arm64 run: | - make talosctl-all kernel sd-boot sd-stub initramfs installer imager talos + make talosctl-all kernel sd-boot sd-stub initramfs installer-base imager talos - name: release-notes run: | make release-notes @@ -3760,7 +3761,7 @@ jobs: env: PLATFORM: linux/amd64,linux/arm64 run: | - make talosctl-all kernel sd-boot sd-stub initramfs installer imager talos talosctl-cni-bundle + make talosctl-all kernel sd-boot sd-stub initramfs installer-base imager talos talosctl-cni-bundle - name: release-notes run: | make release-notes diff --git a/.github/workflows/integration-aws-cron.yaml b/.github/workflows/integration-aws-cron.yaml index f799c9065..6a042022f 100644 --- a/.github/workflows/integration-aws-cron.yaml +++ b/.github/workflows/integration-aws-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-09-09T13:58:35Z by kres 8be5fa7. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-aws-cron concurrency: @@ -85,7 +85,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-aws-nvidia-nonfree-cron.yaml b/.github/workflows/integration-aws-nvidia-nonfree-cron.yaml index d843421b4..e8ff0afa1 100644 --- a/.github/workflows/integration-aws-nvidia-nonfree-cron.yaml +++ b/.github/workflows/integration-aws-nvidia-nonfree-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-09-09T13:58:35Z by kres 8be5fa7. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-aws-nvidia-nonfree-cron concurrency: @@ -89,7 +89,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-aws-nvidia-oss-cron.yaml b/.github/workflows/integration-aws-nvidia-oss-cron.yaml index f8129ef42..9fba4cedc 100644 --- a/.github/workflows/integration-aws-nvidia-oss-cron.yaml +++ b/.github/workflows/integration-aws-nvidia-oss-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-09-09T13:58:35Z by kres 8be5fa7. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-aws-nvidia-oss-cron concurrency: @@ -89,7 +89,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-azure-cron.yaml b/.github/workflows/integration-azure-cron.yaml index e67b2127e..f35b70a6b 100644 --- a/.github/workflows/integration-azure-cron.yaml +++ b/.github/workflows/integration-azure-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-09-09T13:58:35Z by kres 8be5fa7. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-azure-cron concurrency: @@ -85,7 +85,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-cilium-cron.yaml b/.github/workflows/integration-cilium-cron.yaml index 2169ca686..e47ee22c8 100644 --- a/.github/workflows/integration-cilium-cron.yaml +++ b/.github/workflows/integration-cilium-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-12-04T11:25:05Z by kres 232fe63. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-cilium-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-conformance-cron.yaml b/.github/workflows/integration-conformance-cron.yaml index 0f5922eae..fcb9d08d8 100644 --- a/.github/workflows/integration-conformance-cron.yaml +++ b/.github/workflows/integration-conformance-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-12-04T11:25:05Z by kres 232fe63. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-conformance-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-extensions-cron.yaml b/.github/workflows/integration-extensions-cron.yaml index 15b871f42..785019e8f 100644 --- a/.github/workflows/integration-extensions-cron.yaml +++ b/.github/workflows/integration-extensions-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-12-04T12:34:25Z by kres 232fe63. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-extensions-cron concurrency: @@ -77,7 +77,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-gcp-cron.yaml b/.github/workflows/integration-gcp-cron.yaml index 91464ef46..e4a4fb648 100644 --- a/.github/workflows/integration-gcp-cron.yaml +++ b/.github/workflows/integration-gcp-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-09-09T13:58:35Z by kres 8be5fa7. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-gcp-cron concurrency: @@ -85,7 +85,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-image-factory-cron.yaml b/.github/workflows/integration-image-factory-cron.yaml index 8bf1fdde5..4dfd80f5e 100644 --- a/.github/workflows/integration-image-factory-cron.yaml +++ b/.github/workflows/integration-image-factory-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T13:53:18Z by kres 232fe63. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-image-factory-cron concurrency: @@ -79,7 +79,7 @@ jobs: PLATFORM: linux/amd64,linux/arm64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-images-cron.yaml b/.github/workflows/integration-images-cron.yaml index 883e75d02..b1dd61f87 100644 --- a/.github/workflows/integration-images-cron.yaml +++ b/.github/workflows/integration-images-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-09-09T13:58:35Z by kres 8be5fa7. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-images-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-misc-0-cron.yaml b/.github/workflows/integration-misc-0-cron.yaml index 89941fe26..2cf7e43e0 100644 --- a/.github/workflows/integration-misc-0-cron.yaml +++ b/.github/workflows/integration-misc-0-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-02-15T06:21:12Z by kres 8a48729. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-misc-0-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-misc-1-cron.yaml b/.github/workflows/integration-misc-1-cron.yaml index 96b578831..af52acaa0 100644 --- a/.github/workflows/integration-misc-1-cron.yaml +++ b/.github/workflows/integration-misc-1-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-12-24T15:00:58Z by kres fcff05e. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-misc-1-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-misc-2-cron.yaml b/.github/workflows/integration-misc-2-cron.yaml index 2b35175be..a88175380 100644 --- a/.github/workflows/integration-misc-2-cron.yaml +++ b/.github/workflows/integration-misc-2-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-02-15T07:52:36Z by kres 8a48729. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-misc-2-cron concurrency: @@ -79,7 +79,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-misc-3-cron.yaml b/.github/workflows/integration-misc-3-cron.yaml index be5b4d79d..7dbb6730c 100644 --- a/.github/workflows/integration-misc-3-cron.yaml +++ b/.github/workflows/integration-misc-3-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-12-10T11:14:00Z by kres 8183c20. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-misc-3-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-misc-4-cron.yaml b/.github/workflows/integration-misc-4-cron.yaml index 651ae7417..22e38c2c0 100644 --- a/.github/workflows/integration-misc-4-cron.yaml +++ b/.github/workflows/integration-misc-4-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T13:53:18Z by kres 232fe63. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-misc-4-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-provision-0-cron.yaml b/.github/workflows/integration-provision-0-cron.yaml index 2b8f1557a..c733601f7 100644 --- a/.github/workflows/integration-provision-0-cron.yaml +++ b/.github/workflows/integration-provision-0-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T12:57:52Z by kres 232fe63. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-provision-0-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-provision-1-cron.yaml b/.github/workflows/integration-provision-1-cron.yaml index d19ee0085..e6eca2d72 100644 --- a/.github/workflows/integration-provision-1-cron.yaml +++ b/.github/workflows/integration-provision-1-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T12:57:52Z by kres 232fe63. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-provision-1-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-provision-2-cron.yaml b/.github/workflows/integration-provision-2-cron.yaml index 24522b85a..92b7c5b22 100644 --- a/.github/workflows/integration-provision-2-cron.yaml +++ b/.github/workflows/integration-provision-2-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T12:57:52Z by kres 232fe63. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-provision-2-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-qemu-cron.yaml b/.github/workflows/integration-qemu-cron.yaml index 664b39787..3e4f84192 100644 --- a/.github/workflows/integration-qemu-cron.yaml +++ b/.github/workflows/integration-qemu-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-02-16T17:00:53Z by kres 8a48729. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-qemu-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-qemu-csi-longhorn-cron.yaml b/.github/workflows/integration-qemu-csi-longhorn-cron.yaml index 836632859..6e579cca0 100644 --- a/.github/workflows/integration-qemu-csi-longhorn-cron.yaml +++ b/.github/workflows/integration-qemu-csi-longhorn-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-01-22T17:37:55Z by kres 3075de9. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-qemu-csi-longhorn-cron concurrency: @@ -77,7 +77,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-qemu-csi-openebs-cron.yaml b/.github/workflows/integration-qemu-csi-openebs-cron.yaml index dc8d4a47d..4d8e3bdf7 100644 --- a/.github/workflows/integration-qemu-csi-openebs-cron.yaml +++ b/.github/workflows/integration-qemu-csi-openebs-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-01-22T14:23:24Z by kres 3075de9. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-qemu-csi-openebs-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-qemu-csi-rook-ceph-cron.yaml b/.github/workflows/integration-qemu-csi-rook-ceph-cron.yaml index 3b3d8c86b..cb9167758 100644 --- a/.github/workflows/integration-qemu-csi-rook-ceph-cron.yaml +++ b/.github/workflows/integration-qemu-csi-rook-ceph-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-01-22T14:23:24Z by kres 3075de9. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-qemu-csi-rook-ceph-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-qemu-encrypted-vip-cron.yaml b/.github/workflows/integration-qemu-encrypted-vip-cron.yaml index 39a76a0ec..509962ee0 100644 --- a/.github/workflows/integration-qemu-encrypted-vip-cron.yaml +++ b/.github/workflows/integration-qemu-encrypted-vip-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T12:57:52Z by kres 232fe63. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-qemu-encrypted-vip-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.github/workflows/integration-qemu-race-cron.yaml b/.github/workflows/integration-qemu-race-cron.yaml index a24f79718..206e33fa1 100644 --- a/.github/workflows/integration-qemu-race-cron.yaml +++ b/.github/workflows/integration-qemu-race-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-12-25T15:13:54Z by kres fcff05e. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-qemu-race-cron concurrency: @@ -73,7 +73,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | @@ -86,7 +86,7 @@ jobs: TAG_SUFFIX: -race WITH_RACE: "1" run: | - make initramfs installer + make initramfs installer-base - name: e2e-qemu-race env: GITHUB_STEP_NAME: ${{ github.job}}-e2e-qemu-race diff --git a/.github/workflows/integration-trusted-boot-cron.yaml b/.github/workflows/integration-trusted-boot-cron.yaml index 684e5d4f9..838ea9d2a 100644 --- a/.github/workflows/integration-trusted-boot-cron.yaml +++ b/.github/workflows/integration-trusted-boot-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-28T13:53:18Z by kres 232fe63. +# Generated on 2025-02-26T15:23:43Z by kres 1281806. name: integration-trusted-boot-cron concurrency: @@ -79,7 +79,7 @@ jobs: PLATFORM: linux/amd64 PUSH: "true" run: | - make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + make talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 - name: talosctl-cni-bundle if: github.event_name == 'schedule' run: | diff --git a/.kres.yaml b/.kres.yaml index 1b3370f49..aa4fb9bee 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -102,7 +102,7 @@ spec: PLATFORM: linux/amd64 - name: check-dirty - name: build - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64,linux/arm64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -116,6 +116,7 @@ spec: - name: images-essential environment: PLATFORM: linux/amd64,linux/arm64 + IMAGER_ARGS: "--extra-kernel-arg=console=ttyS0" IMAGE_REGISTRY: registry.dev.siderolabs.io - name: unit-tests - name: unit-tests-race @@ -142,7 +143,7 @@ spec: - not-on-tag steps: - name: build - command: talosctl-all kernel sd-boot sd-stub initramfs installer imager talos + command: talosctl-all kernel sd-boot sd-stub initramfs installer-base imager talos environment: PLATFORM: linux/amd64,linux/arm64 - name: release-notes @@ -168,7 +169,7 @@ spec: - only-on-tag steps: - name: build - command: talosctl-all kernel sd-boot sd-stub initramfs installer imager talos talosctl-cni-bundle + command: talosctl-all kernel sd-boot sd-stub initramfs installer-base imager talos talosctl-cni-bundle environment: PLATFORM: linux/amd64,linux/arm64 - name: release-notes @@ -320,7 +321,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -375,7 +376,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -432,7 +433,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -500,7 +501,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -551,7 +552,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -602,7 +603,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -653,7 +654,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -738,7 +739,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -824,7 +825,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -928,7 +929,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -997,7 +998,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1087,7 +1088,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1167,7 +1168,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1247,7 +1248,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1302,7 +1303,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1311,7 +1312,7 @@ spec: conditions: - only-on-schedule - name: build-race - command: initramfs installer + command: initramfs installer-base environment: PUSH: true TAG_SUFFIX: -race @@ -1368,7 +1369,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1438,7 +1439,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1528,7 +1529,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1594,7 +1595,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1657,7 +1658,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1751,7 +1752,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64,linux/arm64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1896,7 +1897,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -1971,7 +1972,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -2068,7 +2069,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -2162,7 +2163,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io @@ -2241,7 +2242,7 @@ spec: - name: build conditions: - only-on-schedule - command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer imager talos _out/integration-test-linux-amd64 + command: talosctl-linux-amd64 kernel sd-boot sd-stub initramfs installer-base imager talos _out/integration-test-linux-amd64 environment: PLATFORM: linux/amd64 IMAGE_REGISTRY: registry.dev.siderolabs.io diff --git a/Dockerfile b/Dockerfile index 452d52fdb..ecce932bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,42 +9,59 @@ ARG INSTALLER_ARCH=scratch ARG DEBUG_TOOLS_SOURCE=scratch ARG PKGS_PREFIX=scratch -ARG PKG_FHS=scratch +ARG TOOLS_PREFIX=scratch + +ARG PKG_APPARMOR=scratch ARG PKG_CA_CERTIFICATES=scratch -ARG PKG_CRYPTSETUP=scratch +ARG PKG_CNI=scratch ARG PKG_CONTAINERD=scratch +ARG PKG_CPIO=scratch +ARG PKG_CRYPTSETUP=scratch ARG PKG_DOSFSTOOLS=scratch ARG PKG_E2FSPROGS=scratch -ARG PKG_SYSTEMD_UDEVD=scratch -ARG PKG_LIBCAP=scratch +ARG PKG_FHS=scratch +ARG PKG_FLANNEL_CNI=scratch +ARG PKG_GLIB=scratch ARG PKG_GRUB=scratch -ARG PKG_SD_BOOT=scratch ARG PKG_IPTABLES=scratch ARG PKG_IPXE=scratch +ARG PKG_KERNEL=scratch +ARG PKG_KMOD=scratch +ARG PKG_LIBAIO=scratch +ARG PKG_LIBATTR=scratch +ARG PKG_LIBBURN=scratch +ARG PKG_LIBCAP=scratch ARG PKG_LIBINIH=scratch +ARG PKG_LIBISOBURN=scratch +ARG PKG_LIBISOFS=scratch ARG PKG_LIBJSON_C=scratch +ARG PKG_LIBLZMA=scratch ARG PKG_LIBMNL=scratch ARG PKG_LIBNFTNL=scratch ARG PKG_LIBPOPT=scratch -ARG PKG_LIBSEPOL=scratch -ARG PKG_LIBSELINUX=scratch -ARG PKG_PCRE2=scratch -ARG PKG_LIBURCU=scratch -ARG PKG_OPENSSL=scratch ARG PKG_LIBSECCOMP=scratch +ARG PKG_LIBSELINUX=scratch +ARG PKG_LIBSEPOL=scratch +ARG PKG_LIBURCU=scratch ARG PKG_LINUX_FIRMWARE=scratch ARG PKG_LVM2=scratch -ARG PKG_LIBAIO=scratch +ARG PKG_MTOOLS=scratch ARG PKG_MUSL=scratch +ARG PKG_OPENSSL=scratch +ARG PKG_PCRE2=scratch +ARG PKG_PIGZ=scratch +ARG PKG_QEMU_TOOLS=scratch ARG PKG_RUNC=scratch -ARG PKG_XFSPROGS=scratch -ARG PKG_APPARMOR=scratch -ARG PKG_UTIL_LINUX=scratch -ARG PKG_KMOD=scratch -ARG PKG_KERNEL=scratch -ARG PKG_CNI=scratch -ARG PKG_FLANNEL_CNI=scratch +ARG PKG_SD_BOOT=scratch +ARG PKG_SQUASHFS_TOOLS=scratch +ARG PKG_SYSTEMD_UDEVD=scratch ARG PKG_TALOSCTL_CNI_BUNDLE=scratch +ARG PKG_TAR=scratch +ARG PKG_UTIL_LINUX=scratch +ARG PKG_XFSPROGS=scratch +ARG PKG_XZ=scratch +ARG PKG_ZLIB=scratch +ARG PKG_ZSTD=scratch ARG DEBUG_TOOLS_SOURCE=scratch @@ -90,6 +107,9 @@ FROM --platform=arm64 ${PKG_IPTABLES} AS pkg-iptables-arm64 FROM --platform=amd64 ${PKG_IPXE} AS pkg-ipxe-amd64 FROM --platform=arm64 ${PKG_IPXE} AS pkg-ipxe-arm64 +FROM --platform=amd64 ${PKG_LIBATTR} AS pkg-libattr-amd64 +FROM --platform=arm64 ${PKG_LIBATTR} AS pkg-libattr-arm64 + FROM --platform=amd64 ${PKG_LIBINIH} AS pkg-libinih-amd64 FROM --platform=arm64 ${PKG_LIBINIH} AS pkg-libinih-arm64 @@ -157,6 +177,31 @@ FROM ${PKG_KERNEL} AS pkg-kernel FROM --platform=amd64 ${PKG_KERNEL} AS pkg-kernel-amd64 FROM --platform=arm64 ${PKG_KERNEL} AS pkg-kernel-arm64 +FROM ${PKG_CPIO} AS pkg-cpio +FROM ${PKG_DOSFSTOOLS} AS pkg-dosfstools +FROM ${PKG_E2FSPROGS} AS pkg-e2fsprogs +FROM ${PKG_GLIB} AS pkg-glib +FROM ${PKG_KMOD} AS pkg-kmod +FROM ${PKG_LIBATTR} AS pkg-libattr +FROM ${PKG_LIBBURN} AS pkg-libburn +FROM ${PKG_LIBINIH} AS pkg-libinih +FROM ${PKG_LIBISOBURN} AS pkg-libisoburn +FROM ${PKG_LIBISOFS} AS pkg-libisofs +FROM ${PKG_LIBLZMA} AS pkg-liblzma +FROM ${PKG_LIBURCU} AS pkg-liburcu +FROM ${PKG_MTOOLS} AS pkg-mtools +FROM ${PKG_MUSL} AS pkg-musl +FROM ${PKG_OPENSSL} AS pkg-openssl +FROM ${PKG_PCRE2} AS pkg-pcre2 +FROM ${PKG_PIGZ} AS pkg-pigz +FROM ${PKG_QEMU_TOOLS} AS pkg-qemu-tools +FROM ${PKG_SQUASHFS_TOOLS} AS pkg-squashfs-tools +FROM ${PKG_TAR} AS pkg-tar +FROM ${PKG_XFSPROGS} AS pkg-xfsprogs +FROM ${PKG_XZ} AS pkg-xz +FROM ${PKG_ZLIB} AS pkg-zlib +FROM ${PKG_ZSTD} AS pkg-zstd + FROM --platform=amd64 ${TOOLS} AS tools-amd64 FROM --platform=arm64 ${TOOLS} AS tools-arm64 @@ -202,7 +247,7 @@ FROM ${PKG_TALOSCTL_CNI_BUNDLE} AS extras-talosctl-cni-bundle # The tools target provides base toolchain for the build. -FROM --platform=${BUILDPLATFORM} $TOOLS AS tools +FROM --platform=${BUILDPLATFORM} ${TOOLS_PREFIX}:${TOOLS} AS tools ENV GOTOOLCHAIN=local ENV CGO_ENABLED=0 SHELL ["/bin/bash", "-c"] @@ -291,6 +336,7 @@ ARG REGISTRY ARG TAG ARG ARTIFACTS ARG PKGS +ARG TOOLS ARG EXTRAS RUN mkdir -p pkg/machinery/gendata/data && \ echo -n ${NAME} > pkg/machinery/gendata/data/name && \ @@ -299,6 +345,7 @@ RUN mkdir -p pkg/machinery/gendata/data && \ echo -n ${REGISTRY} > pkg/machinery/gendata/data/registry && \ echo -n ${EXTRAS} > pkg/machinery/gendata/data/extras && \ echo -n ${PKGS} > pkg/machinery/gendata/data/pkgs && \ + echo -n ${TOOLS} > pkg/machinery/gendata/data/tools && \ echo -n ${TAG} > pkg/machinery/gendata/data/tag && \ echo -n ${ARTIFACTS} > pkg/machinery/gendata/data/artifacts @@ -311,6 +358,7 @@ RUN echo -n "undefined" > pkg/machinery/gendata/data/sha && \ echo -n ${ABBREV_TAG} > pkg/machinery/gendata/data/tag RUN mkdir -p _out && \ echo PKGS=${PKGS} >> _out/talos-metadata && \ + echo TOOLS=${TOOLS} >> _out/talos-metadata && \ echo TAG=${TAG} >> _out/talos-metadata && \ echo EXTRAS=${EXTRAS} >> _out/talos-metadata @@ -684,6 +732,7 @@ COPY --link --from=pkg-e2fsprogs-amd64 / /rootfs COPY --link --from=pkg-systemd-udevd-amd64 / /rootfs COPY --link --from=pkg-libcap-amd64 / /rootfs COPY --link --from=pkg-iptables-amd64 / /rootfs +COPY --link --from=pkg-libattr-amd64 / /rootfs COPY --link --from=pkg-libinih-amd64 / /rootfs COPY --link --from=pkg-libjson-c-amd64 / /rootfs COPY --link --from=pkg-libmnl-amd64 / /rootfs @@ -761,6 +810,7 @@ COPY --link --from=pkg-e2fsprogs-arm64 / /rootfs COPY --link --from=pkg-systemd-udevd-arm64 / /rootfs COPY --link --from=pkg-libcap-arm64 / /rootfs COPY --link --from=pkg-iptables-arm64 / /rootfs +COPY --link --from=pkg-libattr-arm64 / /rootfs COPY --link --from=pkg-libinih-arm64 / /rootfs COPY --link --from=pkg-libjson-c-arm64 / /rootfs COPY --link --from=pkg-libmnl-arm64 / /rootfs @@ -911,9 +961,6 @@ ARG TARGETARCH RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /installer RUN chmod +x /installer -FROM alpine:3.20.3 AS unicode-pf2 -RUN apk add --no-cache --update --no-scripts grub - FROM scratch AS install-artifacts-amd64 COPY --from=pkg-kernel-amd64 /boot/vmlinuz /usr/install/amd64/vmlinuz COPY --from=initramfs-archive-amd64 /initramfs.xz /usr/install/amd64/initramfs.xz @@ -934,37 +981,67 @@ FROM install-artifacts-${TARGETARCH} AS install-artifacts-targetarch FROM install-artifacts-${INSTALLER_ARCH} AS install-artifacts -FROM alpine:3.20.3 AS installer-image -ARG SOURCE_DATE_EPOCH -ENV SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} -ARG INSTALLER_PKGS -RUN apk add --no-cache --update --no-scripts \ - ${INSTALLER_PKGS} +FROM tools AS installer-image-gen +COPY --from=installer-build /installer /rootfs/usr/bin/installer +RUN ln -s installer /rootfs/usr/bin/imager + +FROM scratch AS installer-base-image ARG TARGETARCH ENV TARGETARCH=${TARGETARCH} -COPY --from=installer-build /installer /bin/installer -COPY --chmod=0644 hack/extra-modules.conf /etc/modules.d/10-extra-modules.conf -COPY --from=pkg-grub / / -COPY --from=pkg-grub-arm64 /usr/lib/grub /usr/lib/grub -COPY --from=pkg-grub-amd64 /usr/lib/grub /usr/lib/grub -COPY --from=unicode-pf2 /usr/share/grub/unicode.pf2 /usr/share/grub/unicode.pf2 -RUN ln /bin/installer /bin/imager -RUN find /bin /etc /lib /usr /sbin | grep -Ev '/etc/hosts|/etc/resolv.conf' \ - | xargs -r touch --date="@${SOURCE_DATE_EPOCH}" --no-dereference +COPY --link --from=pkg-fhs / / +COPY --link --from=pkg-ca-certificates / / +COPY --link --from=pkg-musl / / -FROM scratch AS installer-image-squashed -COPY --from=installer-image / / +COPY --link --from=pkg-cpio / / +COPY --link --from=pkg-dosfstools / / +COPY --link --from=pkg-grub / / +COPY --link --from=pkg-grub-amd64 /usr/lib/grub /usr/lib/grub +COPY --link --from=pkg-grub-arm64 /usr/lib/grub /usr/lib/grub +COPY --link --from=pkg-kmod / / +COPY --link --from=pkg-libattr / / +COPY --link --from=pkg-libinih / / +COPY --link --from=pkg-liblzma / / +COPY --link --from=pkg-liburcu / / +COPY --link --from=pkg-openssl / / +COPY --link --from=pkg-xfsprogs / / +COPY --link --from=installer-image-gen /rootfs / + +FROM scratch AS installer-base-image-squashed +COPY --from=installer-base-image / / + +FROM installer-base-image-squashed AS installer-base ARG TAG ENV VERSION=${TAG} LABEL "alpha.talos.dev/version"="${VERSION}" LABEL org.opencontainers.image.source=https://github.com/siderolabs/talos ENTRYPOINT ["/bin/installer"] -FROM installer-image-squashed AS installer +FROM installer-base-image-squashed AS imager-image +COPY --link --from=pkg-e2fsprogs / / +COPY --link --from=pkg-glib / / +COPY --link --from=pkg-libburn / / +COPY --link --from=pkg-libisoburn / / +COPY --link --from=pkg-libisofs / / +COPY --link --from=pkg-mtools / / +COPY --link --from=pkg-pcre2 / / +COPY --link --from=pkg-pigz / / +COPY --link --from=pkg-qemu-tools / / +COPY --link --from=pkg-squashfs-tools / / +COPY --link --from=pkg-tar / / +COPY --link --from=pkg-xz / / +COPY --link --from=pkg-zlib / / +COPY --link --from=pkg-zstd / / +COPY --chmod=0644 hack/extra-modules.conf /etc/modules.d/10-extra-modules.conf COPY --from=install-artifacts / / -FROM installer-image-squashed AS imager -COPY --from=install-artifacts / / +FROM scratch AS imager-image-squashed +COPY --from=imager-image / / + +FROM imager-image-squashed AS imager +ARG TAG +ENV VERSION=${TAG} +LABEL "alpha.talos.dev/version"="${VERSION}" +LABEL org.opencontainers.image.source=https://github.com/siderolabs/talos ENTRYPOINT ["/bin/imager"] FROM imager AS iso-amd64-build diff --git a/Makefile b/Makefile index 761541390..a650e02c4 100644 --- a/Makefile +++ b/Makefile @@ -17,54 +17,70 @@ ZSTD_COMPRESSION_LEVEL ?= 18 CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q") ARTIFACTS := _out -TOOLS ?= ghcr.io/siderolabs/tools:v1.10.0-alpha.0-14-g46be459 DEBUG_TOOLS_SOURCE := scratch EMBED_TARGET ?= embed +TOOLS_PREFIX ?= ghcr.io/siderolabs/tools +TOOLS ?= v1.10.0-alpha.0-18-gfcee25b PKGS_PREFIX ?= ghcr.io/siderolabs -PKGS ?= v1.10.0-alpha.0-38-g76a0316 +PKGS ?= v1.10.0-alpha.0-47-g6fb00b4 EXTRAS ?= v1.10.0-alpha.0-3-g4102a78 KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest -PKG_FHS ?= $(PKGS_PREFIX)/fhs:$(PKGS) -PKG_CA_CERTIFICATES ?= $(PKGS_PREFIX)/ca-certificates:$(PKGS) PKG_APPARMOR ?= $(PKGS_PREFIX)/apparmor:$(PKGS) -PKG_CRYPTSETUP ?= $(PKGS_PREFIX)/cryptsetup:$(PKGS) +PKG_CA_CERTIFICATES ?= $(PKGS_PREFIX)/ca-certificates:$(PKGS) +PKG_CNI ?= $(PKGS_PREFIX)/cni:$(PKGS) PKG_CONTAINERD ?= $(PKGS_PREFIX)/containerd:$(PKGS) +PKG_CPIO ?= $(PKGS_PREFIX)/cpio:$(PKGS) +PKG_CRYPTSETUP ?= $(PKGS_PREFIX)/cryptsetup:$(PKGS) PKG_DOSFSTOOLS ?= $(PKGS_PREFIX)/dosfstools:$(PKGS) PKG_E2FSPROGS ?= $(PKGS_PREFIX)/e2fsprogs:$(PKGS) -PKG_SYSTEMD_UDEVD ?= $(PKGS_PREFIX)/systemd-udevd:$(PKGS) -PKG_LIBCAP ?= $(PKGS_PREFIX)/libcap:$(PKGS) +PKG_FHS ?= $(PKGS_PREFIX)/fhs:$(PKGS) +PKG_FLANNEL_CNI ?= $(PKGS_PREFIX)/flannel-cni:$(PKGS) +PKG_GLIB ?= $(PKGS_PREFIX)/glib:$(PKGS) PKG_GRUB ?= $(PKGS_PREFIX)/grub:$(PKGS) -PKG_SD_BOOT ?= $(PKGS_PREFIX)/sd-boot:$(PKGS) PKG_IPTABLES ?= $(PKGS_PREFIX)/iptables:$(PKGS) PKG_IPXE ?= $(PKGS_PREFIX)/ipxe:$(PKGS) +PKG_KERNEL ?= $(PKGS_PREFIX)/kernel:$(PKGS) +PKG_KMOD ?= $(PKGS_PREFIX)/kmod:$(PKGS) +PKG_LIBAIO ?= $(PKGS_PREFIX)/libaio:$(PKGS) +PKG_LIBATTR ?= $(PKGS_PREFIX)/libattr:$(PKGS) +PKG_LIBBURN ?= $(PKGS_PREFIX)/libburn:$(PKGS) +PKG_LIBCAP ?= $(PKGS_PREFIX)/libcap:$(PKGS) PKG_LIBINIH ?= $(PKGS_PREFIX)/libinih:$(PKGS) +PKG_LIBISOBURN ?= $(PKGS_PREFIX)/libisoburn:$(PKGS) +PKG_LIBISOFS ?= $(PKGS_PREFIX)/libisofs:$(PKGS) PKG_LIBJSON_C ?= $(PKGS_PREFIX)/libjson-c:$(PKGS) +PKG_LIBLZMA ?= $(PKGS_PREFIX)/liblzma:$(PKGS) PKG_LIBMNL ?= $(PKGS_PREFIX)/libmnl:$(PKGS) PKG_LIBNFTNL ?= $(PKGS_PREFIX)/libnftnl:$(PKGS) PKG_LIBPOPT ?= $(PKGS_PREFIX)/libpopt:$(PKGS) -PKG_LIBSEPOL ?= $(PKGS_PREFIX)/libsepol:$(PKGS) -PKG_LIBSELINUX ?= $(PKGS_PREFIX)/libselinux:$(PKGS) -PKG_PCRE2 ?= $(PKGS_PREFIX)/pcre2:$(PKGS) -PKG_LIBURCU ?= $(PKGS_PREFIX)/liburcu:$(PKGS) -PKG_OPENSSL ?= $(PKGS_PREFIX)/openssl:$(PKGS) PKG_LIBSECCOMP ?= $(PKGS_PREFIX)/libseccomp:$(PKGS) +PKG_LIBSELINUX ?= $(PKGS_PREFIX)/libselinux:$(PKGS) +PKG_LIBSEPOL ?= $(PKGS_PREFIX)/libsepol:$(PKGS) +PKG_LIBURCU ?= $(PKGS_PREFIX)/liburcu:$(PKGS) PKG_LINUX_FIRMWARE ?= $(PKGS_PREFIX)/linux-firmware:$(PKGS) PKG_LVM2 ?= $(PKGS_PREFIX)/lvm2:$(PKGS) -PKG_LIBAIO ?= $(PKGS_PREFIX)/libaio:$(PKGS) +PKG_MTOOLS ?= $(PKGS_PREFIX)/mtools:$(PKGS) PKG_MUSL ?= $(PKGS_PREFIX)/musl:$(PKGS) +PKG_OPENSSL ?= $(PKGS_PREFIX)/openssl:$(PKGS) +PKG_PCRE2 ?= $(PKGS_PREFIX)/pcre2:$(PKGS) +PKG_PIGZ ?= $(PKGS_PREFIX)/pigz:$(PKGS) +PKG_QEMU_TOOLS ?= $(PKGS_PREFIX)/qemu-tools:$(PKGS) PKG_RUNC ?= $(PKGS_PREFIX)/runc:$(PKGS) -PKG_XFSPROGS ?= $(PKGS_PREFIX)/xfsprogs:$(PKGS) -PKG_UTIL_LINUX ?= $(PKGS_PREFIX)/util-linux:$(PKGS) -PKG_KMOD ?= $(PKGS_PREFIX)/kmod:$(PKGS) -PKG_CNI ?= $(PKGS_PREFIX)/cni:$(PKGS) -PKG_FLANNEL_CNI ?= $(PKGS_PREFIX)/flannel-cni:$(PKGS) -PKG_KERNEL ?= $(PKGS_PREFIX)/kernel:$(PKGS) +PKG_SD_BOOT ?= $(PKGS_PREFIX)/sd-boot:$(PKGS) +PKG_SQUASHFS_TOOLS ?= $(PKGS_PREFIX)/squashfs-tools:$(PKGS) +PKG_SYSTEMD_UDEVD ?= $(PKGS_PREFIX)/systemd-udevd:$(PKGS) PKG_TALOSCTL_CNI_BUNDLE ?= $(PKGS_PREFIX)/talosctl-cni-bundle:$(EXTRAS) +PKG_TAR ?= $(PKGS_PREFIX)/tar:$(PKGS) +PKG_UTIL_LINUX ?= $(PKGS_PREFIX)/util-linux:$(PKGS) +PKG_XFSPROGS ?= $(PKGS_PREFIX)/xfsprogs:$(PKGS) +PKG_XZ ?= $(PKGS_PREFIX)/xz:$(PKGS) +PKG_ZLIB ?= $(PKGS_PREFIX)/zlib:$(PKGS) +PKG_ZSTD ?= $(PKGS_PREFIX)/zstd:$(PKGS) # renovate: datasource=github-tags depName=golang/go GO_VERSION ?= 1.24 @@ -128,26 +144,7 @@ SHORT_INTEGRATION_TEST ?= CUSTOM_CNI_URL ?= INSTALLER_ARCH ?= all -INSTALLER_ONLY_PKGS ?= \ - bash \ - cpio \ - dosfstools \ - efibootmgr \ - kmod \ - squashfs-tools \ - xfsprogs \ - xz \ - zstd -IMAGER_EXTRA_PKGS ?= \ - e2fsprogs \ - mtools \ - pigz \ - qemu-img \ - tar \ - xorriso - -INSTALLER_PKGS ?= $(INSTALLER_ONLY_PKGS) $(IMAGER_EXTRA_PKGS) IMAGER_ARGS ?= CGO_ENABLED ?= 0 @@ -192,85 +189,101 @@ COMMON_ARGS := --file=Dockerfile COMMON_ARGS += --progress=$(PROGRESS) COMMON_ARGS += --platform=$(PLATFORM) COMMON_ARGS += --push=$(PUSH) -COMMON_ARGS += --build-arg=TOOLS=$(TOOLS) -COMMON_ARGS += --build-arg=DEBUG_TOOLS_SOURCE=$(DEBUG_TOOLS_SOURCE) -COMMON_ARGS += --build-arg=PKGS=$(PKGS) -COMMON_ARGS += --build-arg=EXTRAS=$(EXTRAS) -COMMON_ARGS += --build-arg=EMBED_TARGET=$(EMBED_TARGET) -COMMON_ARGS += --build-arg=GOFUMPT_VERSION=$(GOFUMPT_VERSION) -COMMON_ARGS += --build-arg=GOIMPORTS_VERSION=$(GOIMPORTS_VERSION) -COMMON_ARGS += --build-arg=STRINGER_VERSION=$(STRINGER_VERSION) -COMMON_ARGS += --build-arg=ENUMER_VERSION=$(ENUMER_VERSION) -COMMON_ARGS += --build-arg=DEEPCOPY_GEN_VERSION=$(DEEPCOPY_GEN_VERSION) -COMMON_ARGS += --build-arg=VTPROTOBUF_VERSION=$(VTPROTOBUF_VERSION) -COMMON_ARGS += --build-arg=IMPORTVET_VERSION=$(IMPORTVET_VERSION) -COMMON_ARGS += --build-arg=PROTOTOOL_VERSION=$(PROTOTOOL_VERSION) -COMMON_ARGS += --build-arg=PROTOC_GEN_DOC_VERSION=$(PROTOC_GEN_DOC_VERSION) -COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION=$(GOLANGCILINT_VERSION) -COMMON_ARGS += --build-arg=DEEPCOPY_VERSION=$(DEEPCOPY_VERSION) -COMMON_ARGS += --build-arg=MARKDOWNLINTCLI_VERSION=$(MARKDOWNLINTCLI_VERSION) -COMMON_ARGS += --build-arg=TEXTLINT_VERSION=$(TEXTLINT_VERSION) -COMMON_ARGS += --build-arg=TEXTLINT_FILTER_RULE_COMMENTS_VERSION=$(TEXTLINT_FILTER_RULE_COMMENTS_VERSION) -COMMON_ARGS += --build-arg=TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION=$(TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION) -COMMON_ARGS += --build-arg=TAG=$(TAG) -COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) + +COMMON_ARGS += --build-arg=ABBREV_TAG=$(ABBREV_TAG) COMMON_ARGS += --build-arg=ARTIFACTS=$(ARTIFACTS) -COMMON_ARGS += --build-arg=TESTPKGS=$(TESTPKGS) -COMMON_ARGS += --build-arg=INSTALLER_ARCH=$(INSTALLER_ARCH) -COMMON_ARGS += --build-arg=INSTALLER_PKGS="$(INSTALLER_PKGS)" COMMON_ARGS += --build-arg=CGO_ENABLED=$(CGO_ENABLED) -COMMON_ARGS += --build-arg=GO_BUILDFLAGS="$(GO_BUILDFLAGS)" +COMMON_ARGS += --build-arg=DEBUG_TOOLS_SOURCE=$(DEBUG_TOOLS_SOURCE) +COMMON_ARGS += --build-arg=DEEPCOPY_GEN_VERSION=$(DEEPCOPY_GEN_VERSION) +COMMON_ARGS += --build-arg=DEEPCOPY_VERSION=$(DEEPCOPY_VERSION) +COMMON_ARGS += --build-arg=EMBED_TARGET=$(EMBED_TARGET) +COMMON_ARGS += --build-arg=ENUMER_VERSION=$(ENUMER_VERSION) +COMMON_ARGS += --build-arg=EXTRAS=$(EXTRAS) COMMON_ARGS += --build-arg=GO_BUILDFLAGS_TALOSCTL="$(GO_BUILDFLAGS_TALOSCTL)" +COMMON_ARGS += --build-arg=GO_BUILDFLAGS="$(GO_BUILDFLAGS)" COMMON_ARGS += --build-arg=GO_LDFLAGS="$(GO_LDFLAGS)" COMMON_ARGS += --build-arg=GOAMD64="$(GOAMD64)" +COMMON_ARGS += --build-arg=GOFUMPT_VERSION=$(GOFUMPT_VERSION) +COMMON_ARGS += --build-arg=GOIMPORTS_VERSION=$(GOIMPORTS_VERSION) +COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION=$(GOLANGCILINT_VERSION) COMMON_ARGS += --build-arg=http_proxy=$(http_proxy) COMMON_ARGS += --build-arg=https_proxy=$(https_proxy) +COMMON_ARGS += --build-arg=IMPORTVET_VERSION=$(IMPORTVET_VERSION) +COMMON_ARGS += --build-arg=INSTALLER_ARCH=$(INSTALLER_ARCH) +COMMON_ARGS += --build-arg=MARKDOWNLINTCLI_VERSION=$(MARKDOWNLINTCLI_VERSION) +COMMON_ARGS += --build-arg=MICROSOFT_SECUREBOOT_RELEASE=$(MICROSOFT_SECUREBOOT_RELEASE) COMMON_ARGS += --build-arg=NAME=$(NAME) -COMMON_ARGS += --build-arg=SHA=$(SHA) -COMMON_ARGS += --build-arg=USERNAME=$(USERNAME) -COMMON_ARGS += --build-arg=REGISTRY=$(REGISTRY) -COMMON_ARGS += --build-arg=PKGS_PREFIX=$(PKGS_PREFIX) -COMMON_ARGS += --build-arg=PKG_FHS=$(PKG_FHS) -COMMON_ARGS += --build-arg=PKG_CA_CERTIFICATES=$(PKG_CA_CERTIFICATES) COMMON_ARGS += --build-arg=PKG_APPARMOR=$(PKG_APPARMOR) -COMMON_ARGS += --build-arg=PKG_CRYPTSETUP=$(PKG_CRYPTSETUP) +COMMON_ARGS += --build-arg=PKG_CA_CERTIFICATES=$(PKG_CA_CERTIFICATES) +COMMON_ARGS += --build-arg=PKG_CNI=$(PKG_CNI) COMMON_ARGS += --build-arg=PKG_CONTAINERD=$(PKG_CONTAINERD) +COMMON_ARGS += --build-arg=PKG_CPIO=$(PKG_CPIO) +COMMON_ARGS += --build-arg=PKG_CRYPTSETUP=$(PKG_CRYPTSETUP) COMMON_ARGS += --build-arg=PKG_DOSFSTOOLS=$(PKG_DOSFSTOOLS) COMMON_ARGS += --build-arg=PKG_E2FSPROGS=$(PKG_E2FSPROGS) -COMMON_ARGS += --build-arg=PKG_SYSTEMD_UDEVD=$(PKG_SYSTEMD_UDEVD) -COMMON_ARGS += --build-arg=PKG_LIBCAP=$(PKG_LIBCAP) +COMMON_ARGS += --build-arg=PKG_FHS=$(PKG_FHS) +COMMON_ARGS += --build-arg=PKG_FLANNEL_CNI=$(PKG_FLANNEL_CNI) +COMMON_ARGS += --build-arg=PKG_GLIB=$(PKG_GLIB) COMMON_ARGS += --build-arg=PKG_GRUB=$(PKG_GRUB) -COMMON_ARGS += --build-arg=PKG_SD_BOOT=$(PKG_SD_BOOT) COMMON_ARGS += --build-arg=PKG_IPTABLES=$(PKG_IPTABLES) COMMON_ARGS += --build-arg=PKG_IPXE=$(PKG_IPXE) +COMMON_ARGS += --build-arg=PKG_KERNEL=$(PKG_KERNEL) +COMMON_ARGS += --build-arg=PKG_KMOD=$(PKG_KMOD) +COMMON_ARGS += --build-arg=PKG_LIBAIO=$(PKG_LIBAIO) +COMMON_ARGS += --build-arg=PKG_LIBATTR=$(PKG_LIBATTR) +COMMON_ARGS += --build-arg=PKG_LIBBURN=$(PKG_LIBBURN) +COMMON_ARGS += --build-arg=PKG_LIBCAP=$(PKG_LIBCAP) COMMON_ARGS += --build-arg=PKG_LIBINIH=$(PKG_LIBINIH) +COMMON_ARGS += --build-arg=PKG_LIBISOBURN=$(PKG_LIBISOBURN) +COMMON_ARGS += --build-arg=PKG_LIBISOFS=$(PKG_LIBISOFS) COMMON_ARGS += --build-arg=PKG_LIBJSON_C=$(PKG_LIBJSON_C) +COMMON_ARGS += --build-arg=PKG_LIBLZMA=$(PKG_LIBLZMA) COMMON_ARGS += --build-arg=PKG_LIBMNL=$(PKG_LIBMNL) COMMON_ARGS += --build-arg=PKG_LIBNFTNL=$(PKG_LIBNFTNL) -COMMON_ARGS += --build-arg=PKG_LIBSEPOL=$(PKG_LIBSEPOL) -COMMON_ARGS += --build-arg=PKG_LIBSELINUX=$(PKG_LIBSELINUX) -COMMON_ARGS += --build-arg=PKG_PCRE2=$(PKG_PCRE2) COMMON_ARGS += --build-arg=PKG_LIBPOPT=$(PKG_LIBPOPT) -COMMON_ARGS += --build-arg=PKG_LIBURCU=$(PKG_LIBURCU) -COMMON_ARGS += --build-arg=PKG_OPENSSL=$(PKG_OPENSSL) COMMON_ARGS += --build-arg=PKG_LIBSECCOMP=$(PKG_LIBSECCOMP) +COMMON_ARGS += --build-arg=PKG_LIBSELINUX=$(PKG_LIBSELINUX) +COMMON_ARGS += --build-arg=PKG_LIBSEPOL=$(PKG_LIBSEPOL) +COMMON_ARGS += --build-arg=PKG_LIBURCU=$(PKG_LIBURCU) COMMON_ARGS += --build-arg=PKG_LINUX_FIRMWARE=$(PKG_LINUX_FIRMWARE) COMMON_ARGS += --build-arg=PKG_LVM2=$(PKG_LVM2) -COMMON_ARGS += --build-arg=PKG_LIBAIO=$(PKG_LIBAIO) +COMMON_ARGS += --build-arg=PKG_MTOOLS=$(PKG_MTOOLS) COMMON_ARGS += --build-arg=PKG_MUSL=$(PKG_MUSL) -COMMON_ARGS += --build-arg=PKG_RUNC=$(PKG_RUNC) -COMMON_ARGS += --build-arg=PKG_XFSPROGS=$(PKG_XFSPROGS) -COMMON_ARGS += --build-arg=PKG_UTIL_LINUX=$(PKG_UTIL_LINUX) -COMMON_ARGS += --build-arg=PKG_KMOD=$(PKG_KMOD) -COMMON_ARGS += --build-arg=PKG_U_BOOT=$(PKG_U_BOOT) +COMMON_ARGS += --build-arg=PKG_OPENSSL=$(PKG_OPENSSL) +COMMON_ARGS += --build-arg=PKG_PCRE2=$(PKG_PCRE2) +COMMON_ARGS += --build-arg=PKG_PIGZ=$(PKG_PIGZ) +COMMON_ARGS += --build-arg=PKG_QEMU_TOOLS=$(PKG_QEMU_TOOLS) COMMON_ARGS += --build-arg=PKG_RASPBERYPI_FIRMWARE=$(PKG_RASPBERYPI_FIRMWARE) -COMMON_ARGS += --build-arg=PKG_CNI=$(PKG_CNI) -COMMON_ARGS += --build-arg=PKG_FLANNEL_CNI=$(PKG_FLANNEL_CNI) -COMMON_ARGS += --build-arg=PKG_KERNEL=$(PKG_KERNEL) +COMMON_ARGS += --build-arg=PKG_RUNC=$(PKG_RUNC) +COMMON_ARGS += --build-arg=PKG_SD_BOOT=$(PKG_SD_BOOT) +COMMON_ARGS += --build-arg=PKG_SQUASHFS_TOOLS=$(PKG_SQUASHFS_TOOLS) +COMMON_ARGS += --build-arg=PKG_SYSTEMD_UDEVD=$(PKG_SYSTEMD_UDEVD) COMMON_ARGS += --build-arg=PKG_TALOSCTL_CNI_BUNDLE=$(PKG_TALOSCTL_CNI_BUNDLE) -COMMON_ARGS += --build-arg=ABBREV_TAG=$(ABBREV_TAG) +COMMON_ARGS += --build-arg=PKG_TAR=$(PKG_TAR) +COMMON_ARGS += --build-arg=PKG_U_BOOT=$(PKG_U_BOOT) +COMMON_ARGS += --build-arg=PKG_UTIL_LINUX=$(PKG_UTIL_LINUX) +COMMON_ARGS += --build-arg=PKG_XFSPROGS=$(PKG_XFSPROGS) +COMMON_ARGS += --build-arg=PKG_XZ=$(PKG_XZ) +COMMON_ARGS += --build-arg=PKG_ZLIB=$(PKG_ZLIB) +COMMON_ARGS += --build-arg=PKG_ZSTD=$(PKG_ZSTD) +COMMON_ARGS += --build-arg=PKGS_PREFIX=$(PKGS_PREFIX) +COMMON_ARGS += --build-arg=PKGS=$(PKGS) +COMMON_ARGS += --build-arg=PROTOC_GEN_DOC_VERSION=$(PROTOC_GEN_DOC_VERSION) +COMMON_ARGS += --build-arg=PROTOTOOL_VERSION=$(PROTOTOOL_VERSION) +COMMON_ARGS += --build-arg=REGISTRY=$(REGISTRY) +COMMON_ARGS += --build-arg=SHA=$(SHA) +COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) +COMMON_ARGS += --build-arg=STRINGER_VERSION=$(STRINGER_VERSION) +COMMON_ARGS += --build-arg=TAG=$(TAG) +COMMON_ARGS += --build-arg=TESTPKGS=$(TESTPKGS) +COMMON_ARGS += --build-arg=TEXTLINT_FILTER_RULE_COMMENTS_VERSION=$(TEXTLINT_FILTER_RULE_COMMENTS_VERSION) +COMMON_ARGS += --build-arg=TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION=$(TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION) +COMMON_ARGS += --build-arg=TEXTLINT_VERSION=$(TEXTLINT_VERSION) +COMMON_ARGS += --build-arg=TOOLS_PREFIX=$(TOOLS_PREFIX) +COMMON_ARGS += --build-arg=TOOLS=$(TOOLS) +COMMON_ARGS += --build-arg=USERNAME=$(USERNAME) +COMMON_ARGS += --build-arg=VTPROTOBUF_VERSION=$(VTPROTOBUF_VERSION) COMMON_ARGS += --build-arg=ZSTD_COMPRESSION_LEVEL=$(ZSTD_COMPRESSION_LEVEL) -COMMON_ARGS += --build-arg=MICROSOFT_SECUREBOOT_RELEASE=$(MICROSOFT_SECUREBOOT_RELEASE) CI_ARGS ?= @@ -390,10 +403,9 @@ sd-boot: ## Outputs the systemd-boot to the artifact directory. sd-stub: ## Outputs the systemd-stub to the artifact directory. @$(MAKE) local-$@ DEST=$(ARTIFACTS) PUSH=false -.PHONY: installer -installer: ## Builds the container image for the installer and outputs it to the registry. - @INSTALLER_ARCH=targetarch INSTALLER_PKGS="$(INSTALLER_ONLY_PKGS)" \ - $(MAKE) registry-$@ +.PHONY: installer-base +installer-base: ## Builds the container image for the installer-base and outputs it to the registry. + @$(MAKE) registry-$@ .PHONY: imager imager: ## Builds the container image for the imager and outputs it to the registry. @@ -444,8 +456,10 @@ image-%: ## Builds the specified image. Valid options are aws, azure, digital-oc docker run --rm -t -v /dev:/dev -v $(PWD)/$(ARTIFACTS):/secureboot:ro -v $(PWD)/$(ARTIFACTS):/out -e SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) --network=host --privileged $(REGISTRY_AND_USERNAME)/imager:$(IMAGE_TAG) $* --arch $$arch $(IMAGER_ARGS) ; \ done -images-essential: image-aws image-azure image-gcp image-metal image-metal-uki secureboot-installer ## Builds only essential images used in the CI (AWS, Azure, GCP, and Metal). +.PHONY: images-essential +images-essential: image-aws image-azure image-gcp image-metal image-metal-uki installer secureboot-installer ## Builds only essential images used in the CI (AWS, Azure, GCP, and Metal). +.PHONY: images images: image-akamai image-aws image-azure image-digital-ocean image-exoscale image-cloudstack image-gcp image-hcloud image-iso image-metal image-metal-uki image-nocloud image-opennebula image-openstack image-oracle image-scaleway image-upcloud image-vmware image-vultr ## Builds all known images (AWS, Azure, DigitalOcean, Exoscale, Cloudstack, GCP, HCloud, Metal, NoCloud, OpenNebula, OpenStack, Oracle, Scaleway, UpCloud, Vultr and VMware). .PHONY: iso @@ -454,9 +468,24 @@ iso: image-iso ## Builds the ISO and outputs it to the artifact directory. .PHONY: secureboot-iso secureboot-iso: image-secureboot-iso ## Builds UEFI only ISO which uses UKI and outputs it to the artifact directory. +IMAGES_LIST := + +.PHONY: installer +installer: ## Builds the installer and outputs it to the artifact directory. + @$(MAKE) image-installer IMAGER_ARGS="--base-installer-image $(REGISTRY_AND_USERNAME)/installer-base:$(IMAGE_TAG) $(IMAGER_ARGS)" + + @crane_args="" + @for platform in $(subst $(,),$(space),$(PLATFORM)); do \ + arch=$$(basename "$${platform}") && \ + image=$$(crane push $(ARTIFACTS)/installer-$${arch}.tar $(REGISTRY_AND_USERNAME)/installer:$(IMAGE_TAG)-$${arch}) && \ + crane_args="$${crane_args} -m $${image}" ; \ + done; \ + crane index append -t "${REGISTRY_AND_USERNAME}/installer:${IMAGE_TAG}" $${crane_args} + + .PHONY: secureboot-installer secureboot-installer: ## Builds UEFI only installer which uses UKI and push it to the registry. - @$(MAKE) image-secureboot-installer IMAGER_ARGS="--base-installer-image $(REGISTRY_AND_USERNAME)/installer:$(IMAGE_TAG) --extra-kernel-arg=console=ttyS0 $(IMAGER_ARGS)" + @$(MAKE) image-secureboot-installer IMAGER_ARGS="--base-installer-image $(REGISTRY_AND_USERNAME)/installer-base:$(IMAGE_TAG) $(IMAGER_ARGS)" @for platform in $(subst $(,),$(space),$(PLATFORM)); do \ arch=$$(basename "$${platform}") && \ crane push $(ARTIFACTS)/installer-$${arch}-secureboot.tar $(REGISTRY_AND_USERNAME)/installer:$(IMAGE_TAG)-$${arch}-secureboot ; \ @@ -651,8 +680,9 @@ release-notes: ARTIFACTS=$(ARTIFACTS) ./hack/release.sh $@ $(ARTIFACTS)/RELEASE_NOTES.md $(TAG) push: ## Pushes the installer, imager, talos and talosctl images to the configured container registry with the generated tag. - @$(MAKE) installer PUSH=true + @$(MAKE) installer-base PUSH=true @$(MAKE) imager PUSH=true + @$(MAKE) installer PUSH=true @$(MAKE) talos PUSH=true @$(MAKE) talosctl-image PUSH=true diff --git a/hack/release.toml b/hack/release.toml index 61eeb7383..80df1caf0 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -18,7 +18,7 @@ preface = """ [notes.updates] title = "Component Updates" description = """\ -* Linux: 6.12.13 +* Linux: 6.12.16 * CNI plugins: 1.6.2 * runc: 1.2.4 * containerd: 2.0.2 diff --git a/hack/test/e2e-qemu.sh b/hack/test/e2e-qemu.sh index 2d9b719f4..68cd94f04 100755 --- a/hack/test/e2e-qemu.sh +++ b/hack/test/e2e-qemu.sh @@ -133,7 +133,6 @@ case "${WITH_ISO:-false}" in false) ;; *) - INSTALLER_IMAGE=${INSTALLER_IMAGE}-amd64-secureboot # we don't use secureboot part here, but this installer contains UKIs QEMU_FLAGS+=("--iso-path=${ARTIFACTS}/metal-amd64.iso") ;; esac @@ -241,7 +240,6 @@ case "${WITH_UKI_BOOT:-false}" in false) ;; *) - INSTALLER_IMAGE=${INSTALLER_IMAGE}-amd64-secureboot # we don't use secureboot part here, but this installer contains UKIs QEMU_FLAGS+=("--uki-path=_out/metal-amd64-uki.efi") ;; esac diff --git a/pkg/imager/out.go b/pkg/imager/out.go index 178e76a92..1209020ce 100644 --- a/pkg/imager/out.go +++ b/pkg/imager/out.go @@ -417,6 +417,14 @@ func (i *Imager) outInstaller(ctx context.Context, path string, report *reporter newInstallerImg := mutate.MediaType(empty.Image, types.OCIManifestSchema1) newInstallerImg = mutate.ConfigMediaType(newInstallerImg, types.OCIConfigJSON) + newInstallerImg, err = mutate.ConfigFile(newInstallerImg, &v1.ConfigFile{ + Architecture: i.prof.Arch, + OS: "linux", + }) + if err != nil { + return fmt.Errorf("failed to set image architecture: %w", err) + } + newInstallerImg, err = mutate.Config(newInstallerImg, config) if err != nil { return fmt.Errorf("failed to set config: %w", err) diff --git a/pkg/imager/post.go b/pkg/imager/post.go index 29b37be67..5c63e8f18 100644 --- a/pkg/imager/post.go +++ b/pkg/imager/post.go @@ -7,6 +7,7 @@ package imager import ( "fmt" "os" + "os/exec" "path/filepath" "github.com/siderolabs/go-cmd/pkg/cmd" @@ -14,6 +15,7 @@ import ( "github.com/siderolabs/talos/pkg/reporter" ) +//nolint:gocyclo func (i *Imager) postProcessTar(filename string, report *reporter.Reporter) (string, error) { report.Report(reporter.Update{Message: "processing .tar.gz", Status: reporter.StatusRunning}) @@ -26,7 +28,61 @@ func (i *Imager) postProcessTar(filename string, report *reporter.Reporter) (str outPath := filename + ".tar.gz" - if _, err := cmd.Run("tar", "-cvf", outPath, "-C", dir, "--sparse", "--use-compress-program=pigz -6", src); err != nil { + pipeR, pipeW, err := os.Pipe() + if err != nil { + return "", err + } + + cmd1 := exec.Command("tar", "-cvf", "-", "-C", dir, "--sparse", src) + + cmd1.Stdout = pipeW + cmd1.Stderr = os.Stderr + + if err := cmd1.Start(); err != nil { + return "", err + } + + if err = pipeW.Close(); err != nil { + return "", err + } + + destination, err := os.OpenFile(outPath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0o644) + if err != nil { + return "", err + } + + defer destination.Close() //nolint:errcheck + + cmd2 := exec.Command("pigz", "-6", "-f", "-") + cmd2.Stdin = pipeR + cmd2.Stdout = destination + cmd2.Stderr = os.Stderr + + if err := cmd2.Start(); err != nil { + return "", err + } + + if err = pipeR.Close(); err != nil { + return "", err + } + + errCh := make(chan error, 1) + + go func() { + errCh <- cmd1.Wait() + }() + + go func() { + errCh <- cmd2.Wait() + }() + + for range 2 { + if err = <-errCh; err != nil { + return "", err + } + } + + if err := destination.Sync(); err != nil { return "", err } diff --git a/pkg/imager/profile/input.go b/pkg/imager/profile/input.go index 744e6694c..425f00d4a 100644 --- a/pkg/imager/profile/input.go +++ b/pkg/imager/profile/input.go @@ -207,6 +207,10 @@ func (i *Input) FillDefaults(arch, version string, secureboot bool) { if i.BaseInstaller == zeroContainerAsset { i.BaseInstaller.ImageRef = fmt.Sprintf("%s:%s", images.DefaultInstallerImageRepository, version) + + if quirks.New(version).SupportsUnifiedInstaller() { + i.BaseInstaller.ImageRef = fmt.Sprintf("%s-base:%s", images.DefaultInstallerImageRepository, version) + } } if i.SDStub == zeroFileAsset { diff --git a/pkg/imager/profile/output.go b/pkg/imager/profile/output.go index 243c9475f..15f5df173 100644 --- a/pkg/imager/profile/output.go +++ b/pkg/imager/profile/output.go @@ -5,7 +5,6 @@ package profile import ( - "github.com/siderolabs/talos/internal/pkg/partition" "github.com/siderolabs/talos/pkg/machinery/imager/quirks" ) @@ -154,6 +153,7 @@ func (o *Output) FillDefaults(arch, version string, secureboot bool) { // Default to dual-boot. o.ImageOptions.Bootloader = DiskImageBootloaderDualBoot - o.ImageOptions.DiskSize += partition.BIOSGrubSize + partition.BootSize + // add extra space for BIOS and BOOT partitions + o.ImageOptions.DiskSize += 1*1024*1024 + 1000*1024*1024 } } diff --git a/pkg/imager/profile/testdata/akamai-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/akamai-amd64-1.10.0.yaml index ac5ff5172..e2bd1fe23 100644 --- a/pkg/imager/profile/testdata/akamai-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/akamai-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/akamai-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/akamai-arm64-1.10.0.yaml index ec13c10ce..5e4cf1514 100644 --- a/pkg/imager/profile/testdata/akamai-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/akamai-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/aws-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/aws-amd64-1.10.0.yaml index 1b40b6a4b..5e3eeab63 100644 --- a/pkg/imager/profile/testdata/aws-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/aws-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/aws-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/aws-arm64-1.10.0.yaml index 7c5db43c3..a64154429 100644 --- a/pkg/imager/profile/testdata/aws-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/aws-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/azure-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/azure-amd64-1.10.0.yaml index 5d4496516..239abcd8d 100644 --- a/pkg/imager/profile/testdata/azure-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/azure-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/azure-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/azure-arm64-1.10.0.yaml index ba572cc37..aa43034eb 100644 --- a/pkg/imager/profile/testdata/azure-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/azure-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/cloudstack-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/cloudstack-amd64-1.10.0.yaml index ab75afbd4..aa1a67ee3 100644 --- a/pkg/imager/profile/testdata/cloudstack-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/cloudstack-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/cloudstack-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/cloudstack-arm64-1.10.0.yaml index 9e1075654..71cf539a6 100644 --- a/pkg/imager/profile/testdata/cloudstack-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/cloudstack-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/digital-ocean-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/digital-ocean-amd64-1.10.0.yaml index 2ecb3375e..e9cfb968d 100644 --- a/pkg/imager/profile/testdata/digital-ocean-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/digital-ocean-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/digital-ocean-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/digital-ocean-arm64-1.10.0.yaml index c6dc8709c..25a99da37 100644 --- a/pkg/imager/profile/testdata/digital-ocean-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/digital-ocean-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/exoscale-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/exoscale-amd64-1.10.0.yaml index e728184e8..8c85c0c90 100644 --- a/pkg/imager/profile/testdata/exoscale-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/exoscale-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/exoscale-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/exoscale-arm64-1.10.0.yaml index bc0ea7e45..bd57d719a 100644 --- a/pkg/imager/profile/testdata/exoscale-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/exoscale-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/gcp-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/gcp-amd64-1.10.0.yaml index 962b8654b..681f4e864 100644 --- a/pkg/imager/profile/testdata/gcp-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/gcp-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/gcp-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/gcp-arm64-1.10.0.yaml index 7187f2abc..21a78027c 100644 --- a/pkg/imager/profile/testdata/gcp-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/gcp-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/hcloud-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/hcloud-amd64-1.10.0.yaml index dd08c608b..4e3793128 100644 --- a/pkg/imager/profile/testdata/hcloud-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/hcloud-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/hcloud-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/hcloud-arm64-1.10.0.yaml index e2c5e6b3c..6491655bb 100644 --- a/pkg/imager/profile/testdata/hcloud-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/hcloud-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/installer-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/installer-amd64-1.10.0.yaml index 0ff1b92c6..f6b7e8a05 100644 --- a/pkg/imager/profile/testdata/installer-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/installer-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: installer outFormat: raw diff --git a/pkg/imager/profile/testdata/installer-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/installer-arm64-1.10.0.yaml index e1860429c..c0375f56f 100644 --- a/pkg/imager/profile/testdata/installer-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/installer-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: installer outFormat: raw diff --git a/pkg/imager/profile/testdata/iso-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/iso-amd64-1.10.0.yaml index 6def63548..c8b0c0741 100644 --- a/pkg/imager/profile/testdata/iso-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/iso-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: iso outFormat: raw diff --git a/pkg/imager/profile/testdata/iso-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/iso-arm64-1.10.0.yaml index f7e23a1cb..aa4845921 100644 --- a/pkg/imager/profile/testdata/iso-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/iso-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: iso outFormat: raw diff --git a/pkg/imager/profile/testdata/metal-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/metal-amd64-1.10.0.yaml index 883fcc042..006a7da69 100644 --- a/pkg/imager/profile/testdata/metal-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/metal-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/metal-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/metal-arm64-1.10.0.yaml index de4db446f..ec6725a29 100644 --- a/pkg/imager/profile/testdata/metal-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/metal-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/metal-uki-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/metal-uki-amd64-1.10.0.yaml index 09fd8a9e9..2eea9a674 100644 --- a/pkg/imager/profile/testdata/metal-uki-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/metal-uki-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: uki outFormat: raw diff --git a/pkg/imager/profile/testdata/metal-uki-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/metal-uki-arm64-1.10.0.yaml index 8fe172a97..20900a935 100644 --- a/pkg/imager/profile/testdata/metal-uki-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/metal-uki-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: uki outFormat: raw diff --git a/pkg/imager/profile/testdata/nocloud-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/nocloud-amd64-1.10.0.yaml index b39cb0553..638b6d4c4 100644 --- a/pkg/imager/profile/testdata/nocloud-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/nocloud-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/nocloud-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/nocloud-arm64-1.10.0.yaml index 5d5189a37..984bd86c8 100644 --- a/pkg/imager/profile/testdata/nocloud-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/nocloud-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/opennebula-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/opennebula-amd64-1.10.0.yaml index 8ae7cf887..7d9ce1494 100644 --- a/pkg/imager/profile/testdata/opennebula-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/opennebula-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/opennebula-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/opennebula-arm64-1.10.0.yaml index df3714ec0..4fd625c4b 100644 --- a/pkg/imager/profile/testdata/opennebula-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/opennebula-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/openstack-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/openstack-amd64-1.10.0.yaml index 1b9db7090..bcc4a7547 100644 --- a/pkg/imager/profile/testdata/openstack-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/openstack-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/openstack-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/openstack-arm64-1.10.0.yaml index 92b22c185..007157afd 100644 --- a/pkg/imager/profile/testdata/openstack-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/openstack-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/oracle-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/oracle-amd64-1.10.0.yaml index 6daec0b9b..c74165a3d 100644 --- a/pkg/imager/profile/testdata/oracle-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/oracle-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/oracle-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/oracle-arm64-1.10.0.yaml index 3c7f62e7e..8639fc3e5 100644 --- a/pkg/imager/profile/testdata/oracle-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/oracle-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/scaleway-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/scaleway-amd64-1.10.0.yaml index ec6db7388..c6b21d70d 100644 --- a/pkg/imager/profile/testdata/scaleway-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/scaleway-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/scaleway-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/scaleway-arm64-1.10.0.yaml index 89d1e101f..b734f6566 100644 --- a/pkg/imager/profile/testdata/scaleway-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/scaleway-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/secureboot-installer-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/secureboot-installer-amd64-1.10.0.yaml index eb2066697..e1c6df529 100644 --- a/pkg/imager/profile/testdata/secureboot-installer-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/secureboot-installer-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 secureboot: secureBootSigner: keyPath: /secureboot/uki-signing-key.pem diff --git a/pkg/imager/profile/testdata/secureboot-installer-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/secureboot-installer-arm64-1.10.0.yaml index 3590089b4..b30774a51 100644 --- a/pkg/imager/profile/testdata/secureboot-installer-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/secureboot-installer-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 secureboot: secureBootSigner: keyPath: /secureboot/uki-signing-key.pem diff --git a/pkg/imager/profile/testdata/secureboot-iso-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/secureboot-iso-amd64-1.10.0.yaml index bc4d4efcc..23d1b0971 100644 --- a/pkg/imager/profile/testdata/secureboot-iso-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/secureboot-iso-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 secureboot: secureBootSigner: keyPath: /secureboot/uki-signing-key.pem diff --git a/pkg/imager/profile/testdata/secureboot-iso-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/secureboot-iso-arm64-1.10.0.yaml index f203dca55..4aeaa5f8e 100644 --- a/pkg/imager/profile/testdata/secureboot-iso-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/secureboot-iso-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 secureboot: secureBootSigner: keyPath: /secureboot/uki-signing-key.pem diff --git a/pkg/imager/profile/testdata/secureboot-metal-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/secureboot-metal-amd64-1.10.0.yaml index e2ae46b14..8d0237a96 100644 --- a/pkg/imager/profile/testdata/secureboot-metal-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/secureboot-metal-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 secureboot: secureBootSigner: keyPath: /secureboot/uki-signing-key.pem diff --git a/pkg/imager/profile/testdata/secureboot-metal-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/secureboot-metal-arm64-1.10.0.yaml index 56a8d0d05..c319aebaf 100644 --- a/pkg/imager/profile/testdata/secureboot-metal-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/secureboot-metal-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 secureboot: secureBootSigner: keyPath: /secureboot/uki-signing-key.pem diff --git a/pkg/imager/profile/testdata/secureboot-metal-uki-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/secureboot-metal-uki-amd64-1.10.0.yaml index 384133d8e..4169aaa33 100644 --- a/pkg/imager/profile/testdata/secureboot-metal-uki-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/secureboot-metal-uki-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 secureboot: secureBootSigner: keyPath: /secureboot/uki-signing-key.pem diff --git a/pkg/imager/profile/testdata/secureboot-metal-uki-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/secureboot-metal-uki-arm64-1.10.0.yaml index e2bfe9cbb..3ca948283 100644 --- a/pkg/imager/profile/testdata/secureboot-metal-uki-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/secureboot-metal-uki-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 secureboot: secureBootSigner: keyPath: /secureboot/uki-signing-key.pem diff --git a/pkg/imager/profile/testdata/upcloud-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/upcloud-amd64-1.10.0.yaml index 62a3c141a..b3b496f05 100644 --- a/pkg/imager/profile/testdata/upcloud-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/upcloud-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/upcloud-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/upcloud-arm64-1.10.0.yaml index fc4897a36..cdb648ce8 100644 --- a/pkg/imager/profile/testdata/upcloud-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/upcloud-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/vmware-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/vmware-amd64-1.10.0.yaml index b6b7c38a6..0b2d17488 100644 --- a/pkg/imager/profile/testdata/vmware-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/vmware-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/vmware-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/vmware-arm64-1.10.0.yaml index 47e585da8..a10da68e1 100644 --- a/pkg/imager/profile/testdata/vmware-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/vmware-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/vultr-amd64-1.10.0.yaml b/pkg/imager/profile/testdata/vultr-amd64-1.10.0.yaml index 087c37f4f..6689c0ea1 100644 --- a/pkg/imager/profile/testdata/vultr-amd64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/vultr-amd64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/amd64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/imager/profile/testdata/vultr-arm64-1.10.0.yaml b/pkg/imager/profile/testdata/vultr-arm64-1.10.0.yaml index 55b7245cf..e70573386 100644 --- a/pkg/imager/profile/testdata/vultr-arm64-1.10.0.yaml +++ b/pkg/imager/profile/testdata/vultr-arm64-1.10.0.yaml @@ -12,7 +12,7 @@ input: sdBoot: path: /usr/install/arm64/systemd-boot.efi baseInstaller: - imageRef: ghcr.io/siderolabs/installer:1.10.0 + imageRef: ghcr.io/siderolabs/installer-base:1.10.0 output: kind: image imageOptions: diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index d1e568497..ff47dce9b 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -14,7 +14,7 @@ import ( const ( // DefaultKernelVersion is the default Linux kernel version. - DefaultKernelVersion = "6.12.13-talos" + DefaultKernelVersion = "6.12.16-talos" // KernelParamConfig is the kernel parameter name for specifying the URL. // to the config. diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index 975bc50e4..b809ad84f 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.10.0-alpha.0-38-g76a0316 \ No newline at end of file +v1.10.0-alpha.0-47-g6fb00b4 \ No newline at end of file diff --git a/pkg/machinery/gendata/data/tools b/pkg/machinery/gendata/data/tools new file mode 100644 index 000000000..001e4a5bd --- /dev/null +++ b/pkg/machinery/gendata/data/tools @@ -0,0 +1 @@ +v1.10.0-alpha.0-18-gfcee25b \ No newline at end of file diff --git a/pkg/machinery/imager/quirks/quirks.go b/pkg/machinery/imager/quirks/quirks.go index 6256ab88d..0e3e77d8c 100644 --- a/pkg/machinery/imager/quirks/quirks.go +++ b/pkg/machinery/imager/quirks/quirks.go @@ -210,3 +210,15 @@ func (q Quirks) SupportsUKIProfiles() bool { return q.v.GTE(minTalosVersionUKIProfiles) } + +var minTalosVersionUnifiedInstaller = semver.MustParse("1.10.0") + +// SupportsUnifiedInstaller returns true if the Talos version supports unified installer. +func (q Quirks) SupportsUnifiedInstaller() bool { + // if the version doesn't parse, we assume it's latest Talos + if q.v == nil { + return true + } + + return q.v.GTE(minTalosVersionUnifiedInstaller) +} diff --git a/pkg/provision/providers/vm/internal/ipxe/data/ipxe/amd64/snp.efi b/pkg/provision/providers/vm/internal/ipxe/data/ipxe/amd64/snp.efi index 931e62652..085ee58fa 100644 Binary files a/pkg/provision/providers/vm/internal/ipxe/data/ipxe/amd64/snp.efi and b/pkg/provision/providers/vm/internal/ipxe/data/ipxe/amd64/snp.efi differ diff --git a/pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi b/pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi index e00d11a53..db31bd7e7 100644 Binary files a/pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi and b/pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi differ