diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8fe9756..fa6a53c 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-08-21T11:43:40Z by kres 6262116. +# Generated on 2025-08-26T16:58:07Z by kres 6262116. concurrency: group: ${{ github.head_ref || github.run_id }} @@ -115,6 +115,14 @@ jobs: PUSH: "true" run: | make extensions + - name: extensions-catalog + if: github.event_name == 'pull_request' + run: | + make extensions-catalog + - name: check-dirty + if: github.event_name == 'pull_request' + run: | + make check-dirty - name: release-notes if: startsWith(github.ref, 'refs/tags/') run: | diff --git a/.kres.yaml b/.kres.yaml index 303fcd8..f0d6825 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -101,10 +101,12 @@ spec: kind: auto.CustomSteps spec: steps: - - name: check-dirty - toplevel: true - name: extensions toplevel: true + - name: extensions-catalog + toplevel: true + - name: check-dirty + toplevel: true - name: extensions-metadata toplevel: true - name: internal/extensions/image-digests @@ -134,6 +136,35 @@ spec: PUSH: true --- kind: custom.Step +name: extensions-catalog +spec: + makefile: + enabled: true + phony: true + depends: + - $(ARTIFACTS)/bldr + script: + - | + @$(ARTIFACTS)/bldr dump --build-arg TAG=VERSION --template hack/catalog.template > $(ARTIFACTS)/catalog.md 2>/dev/null + @lead='^$$'; tail='^$$'; sed -i -e "/$$lead/,/$$tail/{ /$$lead/{p; r $(ARTIFACTS)/catalog.md" -e "}; /$$tail/p; d }" README.md + ghaction: + enabled: true + condition: on-pull-request +--- +kind: custom.Step +name: check-dirty +spec: + makefile: + enabled: true + phony: true + script: + - | + @if test -n "`git status --porcelain`"; then echo "Source tree is dirty"; git status; git diff; exit 1 ; fi + ghaction: + enabled: true + condition: on-pull-request +--- +kind: custom.Step name: extensions-metadata spec: makefile: diff --git a/Makefile b/Makefile index fd27bec..f9c0d9b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-08-26T09:14:44Z by kres 6262116. +# Generated on 2025-08-26T16:58:07Z by kres 6262116. # common variables @@ -25,7 +25,7 @@ SOURCE_DATE_EPOCH := $(shell git log $(INITIAL_COMMIT_SHA) --pretty=%ct) # sync bldr image with pkgfile -BLDR_RELEASE := v0.5.1 +BLDR_RELEASE := v0.5.2 BLDR_IMAGE := ghcr.io/siderolabs/bldr:$(BLDR_RELEASE) BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/src --entrypoint=/bldr $(BLDR_IMAGE) --root=/src @@ -222,6 +222,15 @@ deps.png: ## Generates a dependency graph of the Pkgfile. extensions: internal/extensions/descriptions.yaml @$(MAKE) docker-$@ TARGET_ARGS="--tag=$(EXTENSIONS_IMAGE_REF) --push=$(PUSH)" +.PHONY: extensions-catalog +extensions-catalog: $(ARTIFACTS)/bldr + @$(ARTIFACTS)/bldr dump --build-arg TAG=VERSION --template hack/catalog.template > $(ARTIFACTS)/catalog.md 2>/dev/null + @lead='^$$'; tail='^$$'; sed -i -e "/$$lead/,/$$tail/{ /$$lead/{p; r $(ARTIFACTS)/catalog.md" -e "}; /$$tail/p; d }" README.md + +.PHONY: check-dirty +check-dirty: + @if test -n "`git status --porcelain`"; then echo "Source tree is dirty"; git status; git diff; exit 1 ; fi + .PHONY: extensions-metadata extensions-metadata: $(ARTIFACTS)/bldr @rm -f _out/extensions-metadata @@ -271,4 +280,3 @@ release-notes: $(ARTIFACTS) conformance: @docker pull $(CONFORMANCE_IMAGE) @docker run --rm -it -v $(PWD):/src -w /src $(CONFORMANCE_IMAGE) enforce - diff --git a/Pkgfile b/Pkgfile index 60af901..c3912d6 100644 --- a/Pkgfile +++ b/Pkgfile @@ -1,4 +1,4 @@ -# syntax = ghcr.io/siderolabs/bldr:v0.5.1 +# syntax = ghcr.io/siderolabs/bldr:v0.5.2 format: v1alpha2 diff --git a/README.md b/README.md index 931cc32..50cd38c 100644 --- a/README.md +++ b/README.md @@ -38,122 +38,153 @@ cosign verify --certificate-identity-regexp '@siderolabs\.com$' --certificate-oi ## Extension Catalog +### Official Extension Tiers + +Talos Linux provides a number of official system extensions, which are split into the following +tiers based on support level: + +| Tier | :green_square: core | :yellow_square: extra | :white_large_square: contrib | +| --- | --- | --- | --- | +| Description | Extensions fully supported by Sidero Labs | Some level of support, might vary per extension | Supported by the community | +| Supported by Sidero Labs | 🟢 | ✔️ (best effort) | ❌ | +| Support Channel | GitHub [Issues](https://github.com/siderolabs/extensions/issues), [Discussions](https://github.com/siderolabs/extensions/discussions), [Sidero Labs commercial support](https://www.siderolabs.com/support/) | GitHub [Issues](https://github.com/siderolabs/extensions/issues) and [Discussions](https://github.com/siderolabs/extensions/discussions) | GitHub [Discussions in “contrib” section](https://github.com/siderolabs/extensions/discussions/categories/contrib) | +| Updates managed by Sidero Labs | 🟢 | 🟢 | ✔️ (best effort) | +| Documentation | 🟢 | ✔️ (best effort) | ❌ | +| Automated tests | 🟢 (or no automated tests required, e.g. firmware) | ✔️ (best effort) | ❌ | +| SBOMs | 🟢 (or not required, e.g. firmware) | ✔️ (best effort) | ❌ (community might provide some, but not required) | +| CVE Scan | 🟢 | ✔️ (scan is done, but CVEs don’t block the release) | ❌ | +| Compatibility/Build issues | 🟢 | ✔️ (best effort) | ❌ (extension will be disabled if it fails to build) | + + ### Container Runtimes -| Name | Image | Description | Version Format | -| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | ------------------ | -| [crun](container-runtime/crun/) | [ghcr.io/siderolabs/crun](https://github.com/siderolabs/extensions/pkgs/container/crun) | [crun](https://github.com/containers/crun) container runtime | `upstream version` | -| [ecr-credential-provider](container-runtime/ecr-credential-provider) | [ghcr.io/siderolabs/ecr-credential-provider](https://github.com/siderolabs/extensions/pkgs/container/ecr-credential-provider) | [ECR Credential Provider](https://github.com/kubernetes/cloud-provider-aws/tree/master/cmd/ecr-credential-provider) kubelet plugin | `upstream version` | -| [gvisor](container-runtime/gvisor/) | [ghcr.io/siderolabs/gvisor](https://github.com/siderolabs/extensions/pkgs/container/gvisor) | [gVisor](https://gvisor.dev/) container runtime | `upstream version` | -| [kata-containers](container-runtime/kata-containers) | [ghcr.io/siderolabs/kata-containers](https://github.com/siderolabs/extensions/pkgs/container/kata-containers) | [Kata Containers](https://github.com/kata-containers/kata-containers) container runtime | `upstream version` | -| [spin](container-runtime/spin) | [ghcr.io/siderolabs/spin](https://github.com/siderolabs/extensions/pkgs/container/spin) | [Spin](https://github.com/spinkube/containerd-shim-spin) container runtime | `upstream_version` | -| [stargz-snapshotter](container-runtime/stargz-snapshotter/) | [ghcr.io/siderolabs/stargz-snapshotter](https://github.com/siderolabs/extensions/pkgs/container/stargz-snapshotter) | [Stargz Snapshotter](https://github.com/containerd/stargz-snapshotter) container runtime | `upstream version` | -| [wasmedge](container-runtime/wasmedge) | [ghcr.io/siderolabs/wasmedge](https://github.com/siderolabs/extensions/pkgs/container/wasmedge) | [WasmEdge](https://github.com/containerd/runwasi) container runtime | `upstream_version` | -| [youki](container-runtime/youki) | [ghcr.io/siderolabs/youki](https://github.com/siderolabs/extensions/pkgs/container/youki) | [Youki](https://github.com/youki-dev/youki) container runtime | `upstream_version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [crun](container-runtime/crun) | :yellow_square: extra | [ghcr.io/siderolabs/crun](https://github.com/siderolabs/extensions/pkgs/container/crun) | `1.22` | This system extension provides crun using containerd's runtime handler. | +| [ecr-credential-provider](container-runtime/ecr-credential-provider) | :yellow_square: extra | [ghcr.io/siderolabs/ecr-credential-provider](https://github.com/siderolabs/extensions/pkgs/container/ecr-credential-provider) | `v1.33.1` | This system extension provides a binary which implements Kubelet's CredentialProvider API to authenticate against AWS' Elastic Container Registry and pull images. | +| [gvisor](container-runtime/gvisor) | :green_square: core | [ghcr.io/siderolabs/gvisor](https://github.com/siderolabs/extensions/pkgs/container/gvisor) | `20250707.0` | This system extension provides gVisor using containerd's runtime handler. | +| [gvisor-debug](container-runtime/gvisor-debug) | :yellow_square: extra | [ghcr.io/siderolabs/gvisor-debug](https://github.com/siderolabs/extensions/pkgs/container/gvisor-debug) | `v1.0.0` | This system extension enables gVisor debug logging. | +| [kata-containers](container-runtime/kata-containers) | :yellow_square: extra | [ghcr.io/siderolabs/kata-containers](https://github.com/siderolabs/extensions/pkgs/container/kata-containers) | `3.18.0` | This system extension provides kata-container using containerd's runtime handler. | +| [spin](container-runtime/spin) | :yellow_square: extra | [ghcr.io/siderolabs/spin](https://github.com/siderolabs/extensions/pkgs/container/spin) | `v0.20.0` | This system extension provides support for spin runtime (WebAssembly) containers. | +| [stargz-snapshotter](container-runtime/stargz-snapshotter) | :green_square: core | [ghcr.io/siderolabs/stargz-snapshotter](https://github.com/siderolabs/extensions/pkgs/container/stargz-snapshotter) | `v0.16.3` | This system extension provides Stargz Snapshotter using containerd's runtime handler. | +| [wasmedge](container-runtime/wasmedge) | :yellow_square: extra | [ghcr.io/siderolabs/wasmedge](https://github.com/siderolabs/extensions/pkgs/container/wasmedge) | `v0.6.0` | This system extension provides support for WasmEdge runtime (WebAssembly) containers. | +| [youki](container-runtime/youki) | :white_large_square: contrib | [ghcr.io/siderolabs/youki](https://github.com/siderolabs/extensions/pkgs/container/youki) | `0.5.3` | This system extension provides youki using containerd's runtime handler. | ### Firmware -| Name | Image | Description | Version Format | -| -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | --------------------------- | ------------------------ | -| [amd-ucode](firmware/amd-ucode/) | [ghcr.io/siderolabs/amd-ucode](https://github.com/siderolabs/extensions/pkgs/container/amd-ucode) | AMD CPU microcode updates | `linux firmware version` | -| [bnx2-bnx2x](firmware/bnx2-bnx2x/) | [ghcr.io/siderolabs/bnx2-bnx2x](https://github.com/siderolabs/extensions/pkgs/container/bnx2-bnx2x) | Broadcom NetXtreme firmware | `linux firmware version` | -| [chelsio-firmware](firmware/chelsio-firmware/) | [ghcr.io/siderolabs/chelsio-firmware](https://github.com/siderolabs/extensions/pkgs/container/chelsio-firmware) | Chelsio NIC firmware | `linux firmware version` | -| [intel-ice-firmware](firmware/intel-ice-firmware/) | [ghcr.io/siderolabs/intel-ice-firmware](https://github.com/siderolabs/extensions/pkgs/container/intel-ice-firmware) | Intel ICE NIC firmware | `linux firmware version` | -| [intel-ucode](firmware/intel-ucode/) | [ghcr.io/siderolabs/intel-ucode](https://github.com/siderolabs/extensions/pkgs/container/intel-ucode) | Intel CPU microcode updates | `upstream version` | -| [qlogic-firmware](firmware/qlogic-firmware/) | [ghcr.io/siderolabs/qlogic-firmware](https://github.com/siderolabs/extensions/pkgs/container/qlogic-firmware) | Qlogic firmware | `linux firmware version` | -| [realtek-firmware](firmware/realtek-firmware/) | [ghcr.io/siderolabs/realtek-firmware](https://github.com/siderolabs/extensions/pkgs/container/realtek-firmware) | Realtek firmware | `linux firmware version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [amd-ucode](firmware/amd-ucode) | :green_square: core | [ghcr.io/siderolabs/amd-ucode](https://github.com/siderolabs/extensions/pkgs/container/amd-ucode) | `20250808` | This system extension provides AMD microcode binaries. | +| [bnx2-bnx2x](firmware/bnx2-bnx2x) | :green_square: core | [ghcr.io/siderolabs/bnx2-bnx2x](https://github.com/siderolabs/extensions/pkgs/container/bnx2-bnx2x) | `20250808` | This system extension provides bnx2 and bnx2x binaries. | +| [chelsio-firmware](firmware/chelsio) | :white_large_square: contrib | [ghcr.io/siderolabs/chelsio-firmware](https://github.com/siderolabs/extensions/pkgs/container/chelsio-firmware) | `20250808` | This system extension provides Chelsio NIC firmware binaries. | +| [intel-ice-firmware](firmware/intel-ice-firmware) | :green_square: core | [ghcr.io/siderolabs/intel-ice-firmware](https://github.com/siderolabs/extensions/pkgs/container/intel-ice-firmware) | `20250808` | This system extension provides Intel Ice firmware binaries. | +| [intel-ucode](firmware/intel-ucode) | :green_square: core | [ghcr.io/siderolabs/intel-ucode](https://github.com/siderolabs/extensions/pkgs/container/intel-ucode) | `20250812` | This system extension provides Intel microcode binaries. | +| [qlogic-firmware](firmware/qlogic-firmware) | :green_square: core | [ghcr.io/siderolabs/qlogic-firmware](https://github.com/siderolabs/extensions/pkgs/container/qlogic-firmware) | `20250808` | This system extension provides firmware for QLogic devices. | +| [realtek-firmware](firmware/realtek-firmware) | :green_square: core | [ghcr.io/siderolabs/realtek-firmware](https://github.com/siderolabs/extensions/pkgs/container/realtek-firmware) | `20250808` | This system extension provides realtek firmware binaries. | +| [revpi-firmware](firmware/revpi-firmware) | :white_large_square: contrib | [ghcr.io/siderolabs/revpi-firmware](https://github.com/siderolabs/extensions/pkgs/container/revpi-firmware) | `v1.0.0` | This system extension provides tools e.g. udev rules for the RevolutionPi platform. | ### Direct Rendering Manager (DRM) -| Name | Image | Description | Version Format | -| ------------------------ | ----------------------------------------------------------------------------------------------- | --------------------------------- | ---------------------------------------- | -| [amdgpu](drm/amdgpu/) | [ghcr.io/siderolabs/amdgpu](https://github.com/siderolabs/extensions/pkgs/container/amdgpu) | AMD GPU firmware and drivers | `linux firmware version`-`talos version` | -| [i915](drm/i915/) | [ghcr.io/siderolabs/i915](https://github.com/siderolabs/extensions/pkgs/container/i915) | Intel GPU firmware and drivers | `linux firmware version`-`talos version` | -| [panfrost](drm/panfrost) | [ghcr.io/siderolabs/panfrost](https://github.com/siderolabs/extensions/pkgs/container/panfrost) | Panfrost GPU firmware and drivers | `linux firmware version`-`talos version` | -| [vc4](drm/vc4) | [ghcr.io/siderolabs/vc4](https://github.com/siderolabs/extensions/pkgs/container/vc4) | Broadcom VideoCore GPU drivers | `talos version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [amdgpu](drm/amdgpu) | :green_square: core | [ghcr.io/siderolabs/amdgpu](https://github.com/siderolabs/extensions/pkgs/container/amdgpu) | `20250808-VERSION` | This system extension provides AMDGPU firmware binaries and kernel modules. | +| [i915](drm/i915) | :green_square: core | [ghcr.io/siderolabs/i915](https://github.com/siderolabs/extensions/pkgs/container/i915) | `20250808-VERSION` | This system extension provides Intel GPU microcode binaries and kernel modules. | +| [panfrost](drm/panfrost) | :white_large_square: contrib | [ghcr.io/siderolabs/panfrost](https://github.com/siderolabs/extensions/pkgs/container/panfrost) | `20250808-VERSION` | This system extension provides ARM Mali Midgard, Bifrost, and Valhall firmware binaries and kernel modules. | +| [vc4](drm/vc4) | :yellow_square: extra | [ghcr.io/siderolabs/vc4](https://github.com/siderolabs/extensions/pkgs/container/vc4) | `VERSION` | This system extension provides kernel modules for Broadcom VideoCore GPU. | ### Drivers -| Name | Image | Description | Version Format | -| ------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------ | ----------------------------------------------------- | -| [amazon-ena](drivers/amazon-ena/) | [ghcr.io/siderolabs/amazon-ena](https://github.com/siderolabs/extensions/pkgs/container/amazon-ena) | Amazon ENA driver | `upstream-talos version` | -| [chelsio](drivers/chelsio/) | [ghcr.io/siderolabs/chelsio-drivers](https://github.com/siderolabs/extensions/pkgs/container/chelsio-drivers) | Chelsio NIC drivers | `talos version` | -| [gasket](drivers/gasket/) | [ghcr.io/siderolabs/gasket-driver](https://github.com/siderolabs/extensions/pkgs/container/gasket-driver) | Driver for Google Coral PCIe devices | `gasket driver upstream short commit`-`talos version` | -| [mei](drivers/mei/) | [ghcr.io/siderolabs/mei](https://github.com/siderolabs/extensions/pkgs/container/mei) | Driver for Intel Management Engine | `talos version` | -| [nvidia](nvidia-gpu/nvidia-modules/) | [ghcr.io/siderolabs/nvidia-open-gpu-kernel-modules](https://github.com/siderolabs/extensions/pkgs/container/nvidia-open-gpu-kernel-modules) | NVIDIA OSS Driver | `nvidia driver upstream version`-`talos version` | -| [thunderbolt](drivers/thunderbolt/) | [ghcr.io/siderolabs/thunderbolt](https://github.com/siderolabs/extensions/pkgs/container/thunderbolt) | Thunderbolt drivers | `talos version` | -| [uinput](drivers/uinput/) | [ghcr.io/siderolabs/uinput](https://github.com/siderolabs/extensions/pkgs/container/uinput) | uinput drivers | `talos version` | -| [usb-modem](drivers/usb-modem/) | [ghcr.io/siderolabs/usb-modem-drivers](https://github.com/siderolabs/extensions/pkgs/container/usb-modem-drivers) | USB Modem drivers | `talos version` | -| [v4l-uvc](drivers/v4l-uvc/) | [ghcr.io/siderolabs/v4l-uvc-drivers](https://github.com/siderolabs/extensions/pkgs/container/v4l-uvc-drivers) | USB Video Class (Webcam) drivers | `talos version` | -| [xdma-driver](drivers/xdma-driver/) | [ghcr.io/siderolabs/xdma-driver](https://github.com/siderolabs/extensions/pkgs/container/xdma-driver) | Xilinx PCIe DMA | `upstream-talos version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [amazon-ena](drivers/amazon-ena) | :green_square: core | [ghcr.io/siderolabs/amazon-ena](https://github.com/siderolabs/extensions/pkgs/container/amazon-ena) | `2.15.0-VERSION` | This system extension provides Amazon ENA kernel modules built against a specific Talos version. ENA is a networking interface designed to make good use of modern CPU features and system architectures. | +| [chelsio-drivers](drivers/chelsio) | :yellow_square: extra | [ghcr.io/siderolabs/chelsio-drivers](https://github.com/siderolabs/extensions/pkgs/container/chelsio-drivers) | `VERSION` | This system extension provides Chelsio network drivers. | +| [gasket-driver](drivers/gasket) | :yellow_square: extra | [ghcr.io/siderolabs/gasket-driver](https://github.com/siderolabs/extensions/pkgs/container/gasket-driver) | `5815ee3-VERSION` | This system extension provides google gasket driver kernel modules built against a specific Talos version. This driver is required for PCIe and M.2 Google Coral accelerators. There are 2 kernel modules ("gasket" and "apex") required to enable this driver. | +| [hailort](drivers/hailort) | :yellow_square: extra | [ghcr.io/siderolabs/hailort](https://github.com/siderolabs/extensions/pkgs/container/hailort) | `4.21.0` | Driver for HailoRT family of AI hardware (eg. Hailo-8L) and is required for PCIe and M.2 Hailo accelerators. | +| [mei](drivers/mei) | :green_square: core | [ghcr.io/siderolabs/mei](https://github.com/siderolabs/extensions/pkgs/container/mei) | `VERSION` | This system extension provides Intel Management Engine drivers kernel modules built against a specific Talos version. This driver enables the Intel Management Engine, a prerequisite for Intel Arc discrete GPUs. | +| [tenstorrent](drivers/tenstorrent) | :yellow_square: extra | [ghcr.io/siderolabs/tenstorrent](https://github.com/siderolabs/extensions/pkgs/container/tenstorrent) | `1.34` | Driver for Tenstorrent AI processing hardware | +| [thunderbolt](drivers/thunderbolt) | :yellow_square: extra | [ghcr.io/siderolabs/thunderbolt](https://github.com/siderolabs/extensions/pkgs/container/thunderbolt) | `VERSION` | This system extension provides Thunderbolt/USB4 drivers kernel modules built against a specific Talos version. It enables support for Thunderbolt/USB4 devices, including those used for networking. WARNING: This extension automatically authorizes all Thunderbolt devices during system boot, which poses potential security risks. Use at your own discretion. | +| [uinput](drivers/uinput) | :yellow_square: extra | [ghcr.io/siderolabs/uinput](https://github.com/siderolabs/extensions/pkgs/container/uinput) | `VERSION` | This system extension provides the uinput kernel module built against a specific Talos version. This kernel module makes it possible to emulate input devices from userspace. By writing to /dev/uinput (or /dev/input/uinput) device, a process can create a virtual input device with specific capabilities. Once this virtual device is created, the process can send events through it, that will be delivered to userspace and in-kernel consumers. | +| [usb-modem-drivers](drivers/usb-modem) | :yellow_square: extra | [ghcr.io/siderolabs/usb-modem-drivers](https://github.com/siderolabs/extensions/pkgs/container/usb-modem-drivers) | `VERSION` | This system extension provides USB modem drivers kernel modules built against a specific Talos version. This driver is required for USB modems to function. This extension includes all the drivers needed to operate any USB modem under Linux, but your device might not require all of them. Read your device's docs to learn which drivers you need, or just enable them all as a starting point. | +| [v4l-uvc-drivers](drivers/v4l-uvc) | :yellow_square: extra | [ghcr.io/siderolabs/v4l-uvc-drivers](https://github.com/siderolabs/extensions/pkgs/container/v4l-uvc-drivers) | `VERSION` | This system extension provides the Video4Linux kernel modules required for USB Video Class devices built against a specific Talos version. This driver enables Video4Linux devices such as webcams. | +| [xdma-driver](drivers/xdma-driver) | :yellow_square: extra | [ghcr.io/siderolabs/xdma-driver](https://github.com/siderolabs/extensions/pkgs/container/xdma-driver) | `aefa9a1-VERSION` | Xilinx DMA Driver | ### Digital Video Broadcasting (DVB) -| Name | Image | Description | Version Format | -| ------------------------------- | ----------------------------------------------------------------------------------------------------- | ------------------------------------------------------------ | --------------- | -| [dvb-cx23885](dvb/dvb-cx23885/) | [ghcr.io/siderolabs/dvb-cx23885](https://github.com/siderolabs/extensions/pkgs/container/dvb-cx23885) | DVB kernel modules + firmware for Hauppage WinTV-quadHD PCIe | `talos version` | -| [dvb-m88ds3103](dvb/dvb-m88ds3103/) | [ghcr.io/siderolabs/dvb-m88ds3103](https://github.com/siderolabs/extensions/pkgs/container/dvb-m88ds3103) | DVB firmware for DVBSky S952 PCIe | `upstream version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [dvb-cx23885](dvb/cx23885) | :white_large_square: contrib | [ghcr.io/siderolabs/dvb-cx23885](https://github.com/siderolabs/extensions/pkgs/container/dvb-cx23885) | `VERSION` | This system extension provides the dvb kernel modules required for Hauppage WinTV-quadHD PCIe tuner built against a specific Talos version. Includes the firmware required. | +| [dvb-m88ds3103](dvb/dvb-m88ds3103) | :white_large_square: contrib | [ghcr.io/siderolabs/dvb-m88ds3103](https://github.com/siderolabs/extensions/pkgs/container/dvb-m88ds3103) | `VERSION` | This system extension provides the dvb-demod-m88ds3103.fw firmware for DVB-S/S2 PCIe cards like DVBSky S952. It is intended to be used as a dependency on existing DVB driver extension dvb-cx23885 that provides the necessary kernel modules. | ### Miscellaneous -| Name | Image | Description | Version Format | -| ------------------------------- | ----------------------------------------------------------------------------------------------------- | --------------------------- | ------------------ | -| [binfmt-misc](misc/binfmt-misc) | [ghcr.io/siderolabs/binfmt-misc](https://github.com/siderolabs/extensions/pkgs/container/binfmt-misc) | Miscellaneous Binary Format | `talos version` | -| [glibc](misc/glibc) | [ghcr.io/siderolabs/glibc](https://github.com/siderolabs/extensions/pkgs/container/glibc) | glibc | `upstream version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [binfmt-misc](misc/binfmt-misc) | :yellow_square: extra | [ghcr.io/siderolabs/binfmt-misc](https://github.com/siderolabs/extensions/pkgs/container/binfmt-misc) | `VERSION` | This system extension provides kernel module driver for binfmt-misc built against a specific Talos version. | +| [glibc](misc/glibc) | :green_square: core | [ghcr.io/siderolabs/glibc](https://github.com/siderolabs/extensions/pkgs/container/glibc) | `2.41` | This system extension provides glibc. | ### Network -| Name | Image | Description | Version Format | -| ----------------------------------- | ----------------------------------------------------------------------------------------------------- | --------------------------------------------------------- | ------------------ | -| [cloudflared](network/cloudflared/) | [ghcr.io/siderolabs/cloudflared](https://github.com/siderolabs/extensions/pkgs/container/cloudflared) | [Cloudflared](https://github.com/cloudflare/cloudflared/) | `upstream version` | -| [newt](network/newt/) | [ghcr.io/siderolabs/newt](https://github.com/siderolabs/extensions/pkgs/container/newt) | [Cloudflared](https://github.com/fosrl/newt/) | `upstream version` | -| [nebula](network/nebula/) | [ghcr.io/siderolabs/nebula](https://github.com/siderolabs/extensions/pkgs/container/nebula) | [Nebula](https://github.com/slackhq/nebula) | `upstream version` | -| [lldpd](network/lldpd/) | [ghcr.io/siderolabs/lldpd](https://github.com/siderolabs/extensions/pkgs/container/lldpd) | [LLDP](https://github.com/lldpd/lldpd) | `upstream version` | -| [tailscale](network/tailscale/) | [ghcr.io/siderolabs/tailscale](https://github.com/siderolabs/extensions/pkgs/container/tailscale) | [Tailscale](https://tailscale.com) | `upstream version` | -| [zerotier](network/zerotier/) | [ghcr.io/siderolabs/zerotier](https://github.com/siderolabs/extensions/pkgs/container/zerotier) | [ZeroTier](https://zerotier.com) | `upstream version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [cloudflared](network/cloudflared) | :white_large_square: contrib | [ghcr.io/siderolabs/cloudflared](https://github.com/siderolabs/extensions/pkgs/container/cloudflared) | `2024.12.1` | Cloudflare Tunnel securely connects resources to Cloudflare without a public IP. A lightweight daemon (cloudflared) creates outbound-only connections to Cloudflare, allowing safe access to services like HTTP, SSH, remote desktops, and other protocols. More info: https://github.com/cloudflare/cloudflared/ | +| [lldpd](network/lldpd) | :yellow_square: extra | [ghcr.io/siderolabs/lldpd](https://github.com/siderolabs/extensions/pkgs/container/lldpd) | `1.0.19` | LLDP adds a LLDP discovery service to Talos. LLDP cli can be used to interface with the daemon. | +| [nebula](network/nebula) | :white_large_square: contrib | [ghcr.io/siderolabs/nebula](https://github.com/siderolabs/extensions/pkgs/container/nebula) | `1.9.5` | A scalable overlay networking tool with a focus on performance, simplicity and security | +| [newt](network/newt) | :white_large_square: contrib | [ghcr.io/siderolabs/newt](https://github.com/siderolabs/extensions/pkgs/container/newt) | `1.3.2` | Newt is a fully user space WireGuard tunnel client and TCP/UDP proxy, designed to securely expose private resources controlled by Pangolin. By using Newt, you don't need to manage complex WireGuard tunnels and NATing. More info: https://github.com/fosrl/newt | +| [tailscale](network/tailscale) | :yellow_square: extra | [ghcr.io/siderolabs/tailscale](https://github.com/siderolabs/extensions/pkgs/container/tailscale) | `1.84.2` | Tailscale connects your team's devices and development environments for easy access to remote resources. | +| [zerotier](network/zerotier) | :white_large_square: contrib | [ghcr.io/siderolabs/zerotier](https://github.com/siderolabs/extensions/pkgs/container/zerotier) | `1.14.2` | Connect your Talos cluster into a zerotier network | ### Storage -| Name | Image | Description | Version Format | -| ----------------------------------- | ----------------------------------------------------------------------------------------------------- | ---------------------- | ---------------------------------- | -| [btrfs](storage/btrfs/) | [ghcr.io/siderolabs/btrfs](https://github.com/siderolabs/extensions/pkgs/container/btrfs) | BTRFS driver module | `talos version` | -| [drbd](storage/drbd/) | [ghcr.io/siderolabs/drbd](https://github.com/siderolabs/extensions/pkgs/container/drbd) | DRBD driver module | `upstream version`-`talos version` | -| [iscsi-tools](storage/iscsi-tools/) | [ghcr.io/siderolabs/iscsi-tools](https://github.com/siderolabs/extensions/pkgs/container/iscsi-tools) | Open iSCSI tools | `v0.1.0` | -| [mdadm](storage/mdadm/) | [ghcr.io/siderolabs/mdadm](https://github.com/siderolabs/extensions/pkgs/container/mdadm) | manage MD devices tool | `upstream version` | -| [nfsd](storage/nfsd/) | [ghcr.io/siderolabs/nfsd](https://github.com/siderolabs/extensions/pkgs/container/nfsd) | nfsd kernel module | `talos version` | -| [nfsrahead](storage/nfsrahead/) | [ghcr.io/siderolabs/nfsrahead](https://github.com/siderolabs/extensions/pkgs/container/nfsrahead) | NFS read-ahead tool | `upstream version` | -| [zfs](storage/zfs/) | [ghcr.io/siderolabs/zfs](https://github.com/siderolabs/extensions/pkgs/container/zfs) | ZFS driver module | `upstream version`-`talos version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [btrfs](storage/btrfs) | :yellow_square: extra | [ghcr.io/siderolabs/btrfs](https://github.com/siderolabs/extensions/pkgs/container/btrfs) | `VERSION` | This system extension provides kernel module driver for BTRFS built against a specific Talos version. | +| [drbd](storage/drbd) | :yellow_square: extra | [ghcr.io/siderolabs/drbd](https://github.com/siderolabs/extensions/pkgs/container/drbd) | `9.2.14-VERSION` | This system extension provides kernel module driver for DRBD built against a specific Talos version. | +| [fuse3](storage/fuse3) | :green_square: core | [ghcr.io/siderolabs/fuse3](https://github.com/siderolabs/extensions/pkgs/container/fuse3) | `3.17.2` | This system extension provides fuse3 functionality. | +| [iscsi-tools](storage/iscsi-tools) | :green_square: core | [ghcr.io/siderolabs/iscsi-tools](https://github.com/siderolabs/extensions/pkgs/container/iscsi-tools) | `v0.2.0` | This system extension provides iscsi-tools. | +| [mdadm](storage/mdadm) | :white_large_square: contrib | [ghcr.io/siderolabs/mdadm](https://github.com/siderolabs/extensions/pkgs/container/mdadm) | `v4.3` | This system extension provides mdadm binary. | +| [nfsd](storage/nfsd) | :yellow_square: extra | [ghcr.io/siderolabs/nfsd](https://github.com/siderolabs/extensions/pkgs/container/nfsd) | `VERSION` | This system extension provides kernel module driver for NFSD built against a specific Talos version. | +| [nfsrahead](storage/nfsrahead) | :white_large_square: contrib | [ghcr.io/siderolabs/nfsrahead](https://github.com/siderolabs/extensions/pkgs/container/nfsrahead) | `2.8.3` | This system extension provides nfsrahead, a tool to configure the readahead for NFS mounts. | +| [zfs](storage/zfs) | :yellow_square: extra | [ghcr.io/siderolabs/zfs](https://github.com/siderolabs/extensions/pkgs/container/zfs) | `2.3.3-VERSION` | This system extension provides the ZFS kernel module, the ZFS utilities, and a service to import all ZFS pools on start and unmount all pools on stop. | ### Power -| Name | Image | Description | Version Format | -| ------------------------------- | --------------------------------------------------------------------------------------------------- | -------------------------------------------------------------- | ------------------ | -| [nut-client](power/nut-client/) | [ghcr.io/siderolabs/nut-client](https://github.com/siderolabs/extensions/pkgs/container/nut-client) | [Network UPS Tools](https://networkupstools.org) upsmon client | `upstream version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [nut-client](power/nut-client) | :white_large_square: contrib | [ghcr.io/siderolabs/nut-client](https://github.com/siderolabs/extensions/pkgs/container/nut-client) | `2.8.3` | This system extension provides the network-ups-tools upsmon service. | ### Guest Agents -| Name | Image | Description | Version Format | -| ---------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | ------------------ | -| [metal-agent](guest-agents/metal-agent/) | [ghcr.io/siderolabs/metal-agent](https://github.com/siderolabs/extensions/pkgs/container/metal-agent) | [Talos Metal Agent](https://github.com/siderolabs/talos-metal-agent) | `upstream version` | -| [qemu-guest-agent](guest-agents/qemu-guest-agent/) | [ghcr.io/siderolabs/qemu-guest-agent](https://github.com/siderolabs/extensions/pkgs/container/qemu-guest-agent) | [QEMU Guest Agent](https://wiki.qemu.org/Features/GuestAgent) | `upstream version` | -| [vmtoolsd-guest-agent](guest-agents/vmtoolsd-guest-agent/) | [ghcr.io/siderolabs/vmtoolsd-guest-agent](https://github.com/siderolabs/extensions/pkgs/container/vmtoolsd-guest-agent) | [talos-vmtoolsd](https://github.com/siderolabs/talos-vmtoolsd) | `upstream version` | -| [xen-guest-agent](guest-agents/xen-guest-agent/) | [ghcr.io/siderolabs/xen-guest-agent](https://github.com/siderolabs/extensions/pkgs/container/xen-guest-agent) | [xe-guest-utilities](https://github.com/xenserver/xe-guest-utilitiest) | `upstream version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [glib](guest-agents/qemu-guest-agent/glib) | :yellow_square: extra | [ghcr.io/siderolabs/glib](https://github.com/siderolabs/extensions/pkgs/container/glib) | `10.0.2` | | +| [metal-agent](guest-agents/metal-agent) | :green_square: core | [ghcr.io/siderolabs/metal-agent](https://github.com/siderolabs/extensions/pkgs/container/metal-agent) | `v0.1.3` | This system extension provides talos-metal-agent | +| [pcre2](guest-agents/qemu-guest-agent/pcre2) | :yellow_square: extra | [ghcr.io/siderolabs/pcre2](https://github.com/siderolabs/extensions/pkgs/container/pcre2) | `10.0.2` | | +| [qemu-guest-agent](guest-agents/qemu-guest-agent) | :yellow_square: extra | [ghcr.io/siderolabs/qemu-guest-agent](https://github.com/siderolabs/extensions/pkgs/container/qemu-guest-agent) | `10.0.2` | This system extension provides the QEMU Guest Agent service. | +| [vmtoolsd-guest-agent](guest-agents/vmtoolsd-guest-agent) | :yellow_square: extra | [ghcr.io/siderolabs/vmtoolsd-guest-agent](https://github.com/siderolabs/extensions/pkgs/container/vmtoolsd-guest-agent) | `v1.1.0` | This system extension provides talos-vmtoolsd | +| [xen-guest-agent](guest-agents/xen-guest-agent) | :yellow_square: extra | [ghcr.io/siderolabs/xen-guest-agent](https://github.com/siderolabs/extensions/pkgs/container/xen-guest-agent) | `0.4.0-g5c274e6` | xen-guest-agent communicates information and metrics with the Xen host. | ### NVIDIA GPU -| Name | Description | Version Format | -| ---------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- | -| [nvidia-container-toolkit](nvidia-gpu/nvidia-container-toolkit/) | Tools to run [NVIDIA GPU workloads](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/overview.html) in containers | `driver version`-`toolkit version` | -| [nvidia-fabricmanager](nvidia-gpu/nvidia-fabricmanager/) | [NVIDIA fabric manager](https://docs.nvidia.com/datacenter/tesla/pdf/fabric-manager-user-guide.pdf) support for GPU workloads | `driver version` | -| [nvidia-open-gpu-kernel-modules](nvidia-gpu/nvidia-modules/) | NVIDIA driver kernel modules | `driver version`-`talos version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [nonfree-kmod-nvidia-lts](nvidia-gpu/nonfree/kmod-nvidia/lts) | :green_square: core | [ghcr.io/siderolabs/nonfree-kmod-nvidia-lts](https://github.com/siderolabs/extensions/pkgs/container/nonfree-kmod-nvidia-lts) | `580.65.06-VERSION` | This system extension provides nvidia proprietary kernel modules built against a specific Talos version. | +| [nonfree-kmod-nvidia-production](nvidia-gpu/nonfree/kmod-nvidia/production) | :green_square: core | [ghcr.io/siderolabs/nonfree-kmod-nvidia-production](https://github.com/siderolabs/extensions/pkgs/container/nonfree-kmod-nvidia-production) | `570.172.08-VERSION` | This system extension provides nvidia proprietary kernel modules built against a specific Talos version. | +| [nvidia-container-toolkit-lts](nvidia-gpu/nvidia-container-toolkit/lts) | :green_square: core | [ghcr.io/siderolabs/nvidia-container-toolkit-lts](https://github.com/siderolabs/extensions/pkgs/container/nvidia-container-toolkit-lts) | `580.65.06-v1.17.8` | This system extension provides nvidia runtime and it's dependencies using NVIDIA's runtime handler. | +| [nvidia-container-toolkit-production](nvidia-gpu/nvidia-container-toolkit/production) | :green_square: core | [ghcr.io/siderolabs/nvidia-container-toolkit-production](https://github.com/siderolabs/extensions/pkgs/container/nvidia-container-toolkit-production) | `570.172.08-v1.17.8` | This system extension provides nvidia runtime and it's dependencies using NVIDIA's runtime handler. | +| [nvidia-fabricmanager-lts](nvidia-gpu/nvidia-fabricmanager/lts) | :green_square: core | [ghcr.io/siderolabs/nvidia-fabricmanager-lts](https://github.com/siderolabs/extensions/pkgs/container/nvidia-fabricmanager-lts) | `580.65.06` | This system extension provides the Nvidia fabricmanager for GPU's that need NVLink support. | +| [nvidia-fabricmanager-production](nvidia-gpu/nvidia-fabricmanager/production) | :green_square: core | [ghcr.io/siderolabs/nvidia-fabricmanager-production](https://github.com/siderolabs/extensions/pkgs/container/nvidia-fabricmanager-production) | `570.172.08` | This system extension provides the Nvidia fabricmanager for GPU's that need NVLink support. | +| [nvidia-open-gpu-kernel-modules-lts](nvidia-gpu/nvidia-modules/lts) | :green_square: core | [ghcr.io/siderolabs/nvidia-open-gpu-kernel-modules-lts](https://github.com/siderolabs/extensions/pkgs/container/nvidia-open-gpu-kernel-modules-lts) | `580.65.06-VERSION` | This system extension provides nvidia open source driver kernel modules built against a specific Talos version. | +| [nvidia-open-gpu-kernel-modules-production](nvidia-gpu/nvidia-modules/production) | :green_square: core | [ghcr.io/siderolabs/nvidia-open-gpu-kernel-modules-production](https://github.com/siderolabs/extensions/pkgs/container/nvidia-open-gpu-kernel-modules-production) | `570.172.08-VERSION` | This system extension provides nvidia open source driver kernel modules built against a specific Talos version. | -#### Tools +### Tools -| Name | Description | Version Format | -| ------------------------------------- | ----------------------------------------- | ------------------ | -| [util-linux-tools](tools/util-linux/) | Util Linux tools (`fstrim` and `nsenter`) | `upstream version` | -| [nvme-cli](tools/nvme-cli/) | NVMe command line interface | `upstream version` | -| [ctr](tools/ctr/) | `ctr` command line tool | `upstream version` | +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +| [ctr](tools/ctr) | :green_square: core | [ghcr.io/siderolabs/ctr](https://github.com/siderolabs/extensions/pkgs/container/ctr) | `v2.1.4` | This extension provides ctr containerd helper binary | +| [nvme-cli](tools/nvme-cli) | :white_large_square: contrib | [ghcr.io/siderolabs/nvme-cli](https://github.com/siderolabs/extensions/pkgs/container/nvme-cli) | `v2.14` | This system extension provides the NVMe command line interface. | +| [util-linux-tools](tools/util-linux) | :white_large_square: contrib | [ghcr.io/siderolabs/util-linux-tools](https://github.com/siderolabs/extensions/pkgs/container/util-linux-tools) | `2.41.1` | This system extension provides a minimal util-linux package. | + + ## Building Extensions diff --git a/container-runtime/crun/manifest.yaml b/container-runtime/crun/manifest.yaml.tmpl similarity index 53% rename from container-runtime/crun/manifest.yaml rename to container-runtime/crun/manifest.yaml.tmpl index 6f2d667..8572f98 100644 --- a/container-runtime/crun/manifest.yaml +++ b/container-runtime/crun/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: crun - version: "$VERSION" + version: "{{ .VERSION }}" author: Henrik Gerdes description: | - This system extension provides crun using containerd's runtime handler. + [{{ .TIER }}] This system extension provides crun using containerd's runtime handler. compatibility: talos: version: ">= v1.8.0" diff --git a/container-runtime/crun/pkg.yaml b/container-runtime/crun/pkg.yaml index d737903..8bb9a06 100644 --- a/container-runtime/crun/pkg.yaml +++ b/container-runtime/crun/pkg.yaml @@ -16,9 +16,6 @@ steps: sha256: {{ .CRUN_AMD64_SHA256 }} sha512: {{ .CRUN_AMD64_SHA512 }} # {{ end }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | mkdir -p /rootfs/usr/local/bin diff --git a/container-runtime/crun/vars.yaml b/container-runtime/crun/vars.yaml index 426c466..76905b9 100644 --- a/container-runtime/crun/vars.yaml +++ b/container-runtime/crun/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .CRUN_VERSION }}" +TIER: "extra" diff --git a/container-runtime/ecr-credential-provider/manifest.yaml b/container-runtime/ecr-credential-provider/manifest.yaml.tmpl similarity index 63% rename from container-runtime/ecr-credential-provider/manifest.yaml rename to container-runtime/ecr-credential-provider/manifest.yaml.tmpl index 7365778..2d0bcb0 100644 --- a/container-runtime/ecr-credential-provider/manifest.yaml +++ b/container-runtime/ecr-credential-provider/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: ecr-credential-provider - version: "$VERSION" + version: "{{ .VERSION }}" author: Florian Ströger description: | - This system extension provides a binary which implements Kubelet's CredentialProvider API + [{{ .TIER }}] This system extension provides a binary which implements Kubelet's CredentialProvider API to authenticate against AWS' Elastic Container Registry and pull images. compatibility: talos: diff --git a/container-runtime/ecr-credential-provider/pkg.yaml b/container-runtime/ecr-credential-provider/pkg.yaml index a3ac0e1..a16e23b 100644 --- a/container-runtime/ecr-credential-provider/pkg.yaml +++ b/container-runtime/ecr-credential-provider/pkg.yaml @@ -16,8 +16,6 @@ steps: - /tmp/go/pkg - network: default prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | mkdir -p ${GOPATH}/src/k8s.io/cloud-provider-aws diff --git a/container-runtime/ecr-credential-provider/vars.yaml b/container-runtime/ecr-credential-provider/vars.yaml index d99b1fc..db91109 100644 --- a/container-runtime/ecr-credential-provider/vars.yaml +++ b/container-runtime/ecr-credential-provider/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .CLOUD_PROVIDER_AWS_VERSION }}" +TIER: "extra" diff --git a/container-runtime/gvisor-debug/manifest.yaml b/container-runtime/gvisor-debug/manifest.yaml.tmpl similarity index 59% rename from container-runtime/gvisor-debug/manifest.yaml rename to container-runtime/gvisor-debug/manifest.yaml.tmpl index 30f41be..45a1378 100644 --- a/container-runtime/gvisor-debug/manifest.yaml +++ b/container-runtime/gvisor-debug/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: gvisor-debug - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension enables gVisor debug logging. + [{{ .TIER }}] This system extension enables gVisor debug logging. compatibility: talos: version: ">= v1.0.0" diff --git a/container-runtime/gvisor-debug/pkg.yaml b/container-runtime/gvisor-debug/pkg.yaml index 706acb3..0603a97 100644 --- a/container-runtime/gvisor-debug/pkg.yaml +++ b/container-runtime/gvisor-debug/pkg.yaml @@ -4,10 +4,7 @@ shell: /bin/bash dependencies: - stage: base steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/etc/cri/conf.d cp /pkg/11-gvisor-debug.part /rootfs/etc/cri/conf.d/11-gvisor-debug.part diff --git a/container-runtime/gvisor-debug/vars.yaml b/container-runtime/gvisor-debug/vars.yaml index bc8ad19..9129457 100644 --- a/container-runtime/gvisor-debug/vars.yaml +++ b/container-runtime/gvisor-debug/vars.yaml @@ -1 +1,2 @@ VERSION: "v1.0.0" +TIER: "extra" diff --git a/container-runtime/gvisor/manifest.yaml b/container-runtime/gvisor/manifest.yaml.tmpl similarity index 53% rename from container-runtime/gvisor/manifest.yaml rename to container-runtime/gvisor/manifest.yaml.tmpl index 4113a01..cfec9bc 100644 --- a/container-runtime/gvisor/manifest.yaml +++ b/container-runtime/gvisor/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: gvisor - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides gVisor using containerd's runtime handler. + [{{ .TIER }}] This system extension provides gVisor using containerd's runtime handler. compatibility: talos: version: ">= v1.0.0" diff --git a/container-runtime/gvisor/pkg.yaml b/container-runtime/gvisor/pkg.yaml index 1eb9a29..8625bcf 100644 --- a/container-runtime/gvisor/pkg.yaml +++ b/container-runtime/gvisor/pkg.yaml @@ -16,8 +16,6 @@ steps: - /tmp/go/pkg - network: default prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | mkdir -p ${GOPATH}/src/github.com/google/gvisor diff --git a/container-runtime/gvisor/vars.yaml b/container-runtime/gvisor/vars.yaml index 5580dcd..538e0ad 100644 --- a/container-runtime/gvisor/vars.yaml +++ b/container-runtime/gvisor/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .GVISOR_VERSION }}" +TIER: "core" diff --git a/container-runtime/kata-containers/manifest.yaml b/container-runtime/kata-containers/manifest.yaml.tmpl similarity index 54% rename from container-runtime/kata-containers/manifest.yaml rename to container-runtime/kata-containers/manifest.yaml.tmpl index 576bcb3..8d9df46 100644 --- a/container-runtime/kata-containers/manifest.yaml +++ b/container-runtime/kata-containers/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: kata-containers - version: "$VERSION" + version: "{{ .VERSION }}" author: Fabiano Fidêncio description: | - This system extension provides kata-container using containerd's runtime handler. + [{{ .TIER }}] This system extension provides kata-container using containerd's runtime handler. compatibility: talos: version: ">= v1.7.0" diff --git a/container-runtime/kata-containers/pkg.yaml b/container-runtime/kata-containers/pkg.yaml index 0bfbfc1..8efcab3 100644 --- a/container-runtime/kata-containers/pkg.yaml +++ b/container-runtime/kata-containers/pkg.yaml @@ -27,8 +27,6 @@ steps: - /tmp/go/pkg - network: default prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | mkdir -p kata-static tar xf kata-static.tar.xz -C kata-static diff --git a/container-runtime/kata-containers/vars.yaml b/container-runtime/kata-containers/vars.yaml index 4802b68..b7f70ee 100644 --- a/container-runtime/kata-containers/vars.yaml +++ b/container-runtime/kata-containers/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .KATA_CONTAINERS_VERSION }}" +TIER: "extra" diff --git a/container-runtime/spin/manifest.yaml b/container-runtime/spin/manifest.yaml.tmpl similarity index 51% rename from container-runtime/spin/manifest.yaml rename to container-runtime/spin/manifest.yaml.tmpl index 27d8c3f..a43647a 100644 --- a/container-runtime/spin/manifest.yaml +++ b/container-runtime/spin/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: spin - version: "$VERSION" + version: "{{ .VERSION }}" author: Sven Pfennig description: | - This system extension provides support for spin runtime (WebAssembly) containers. + [{{ .TIER }}] This system extension provides support for spin runtime (WebAssembly) containers. compatibility: talos: version: ">= v1.0.0" diff --git a/container-runtime/spin/pkg.yaml b/container-runtime/spin/pkg.yaml index 1e2d49c..b169dc3 100644 --- a/container-runtime/spin/pkg.yaml +++ b/container-runtime/spin/pkg.yaml @@ -16,9 +16,6 @@ steps: sha256: {{ .SPIN_AMD64_SHA256 }} sha512: {{ .SPIN_AMD64_SHA512 }} # {{ end }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | mkdir -p /rootfs/usr/local/bin diff --git a/container-runtime/spin/vars.yaml b/container-runtime/spin/vars.yaml index 1cfc2a7..0c11fdb 100644 --- a/container-runtime/spin/vars.yaml +++ b/container-runtime/spin/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .SPIN_VERSION }}" +TIER: "extra" diff --git a/container-runtime/stargz-snapshotter/manifest.yaml b/container-runtime/stargz-snapshotter/manifest.yaml.tmpl similarity index 53% rename from container-runtime/stargz-snapshotter/manifest.yaml rename to container-runtime/stargz-snapshotter/manifest.yaml.tmpl index c7d9b18..bf16edf 100644 --- a/container-runtime/stargz-snapshotter/manifest.yaml +++ b/container-runtime/stargz-snapshotter/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: stargz-snapshotter - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides Stargz Snapshotter using containerd's runtime handler. + [{{ .TIER }}] This system extension provides Stargz Snapshotter using containerd's runtime handler. compatibility: talos: version: ">= v1.6.0" diff --git a/container-runtime/stargz-snapshotter/pkg.yaml b/container-runtime/stargz-snapshotter/pkg.yaml index 2a3376f..d42c8fa 100644 --- a/container-runtime/stargz-snapshotter/pkg.yaml +++ b/container-runtime/stargz-snapshotter/pkg.yaml @@ -16,8 +16,6 @@ steps: - /tmp/go/pkg - network: default prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | mkdir -p ${GOPATH}/src/github.com/containerd/stargz-snapshotter diff --git a/container-runtime/stargz-snapshotter/vars.yaml b/container-runtime/stargz-snapshotter/vars.yaml index 351e8e7..6c18373 100644 --- a/container-runtime/stargz-snapshotter/vars.yaml +++ b/container-runtime/stargz-snapshotter/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .STARGZ_SNAPSHOTTER_VERSION }}" +TIER: "core" diff --git a/container-runtime/wasmedge/manifest.yaml b/container-runtime/wasmedge/manifest.yaml.tmpl similarity index 51% rename from container-runtime/wasmedge/manifest.yaml rename to container-runtime/wasmedge/manifest.yaml.tmpl index 1b71223..82c9601 100644 --- a/container-runtime/wasmedge/manifest.yaml +++ b/container-runtime/wasmedge/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: wasmedge - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides support for WasmEdge runtime (WebAssembly) containers. + [{{ .TIER }}] This system extension provides support for WasmEdge runtime (WebAssembly) containers. compatibility: talos: version: ">= v1.0.0" diff --git a/container-runtime/wasmedge/pkg.yaml b/container-runtime/wasmedge/pkg.yaml index 54a91ca..8dd28e9 100644 --- a/container-runtime/wasmedge/pkg.yaml +++ b/container-runtime/wasmedge/pkg.yaml @@ -16,9 +16,6 @@ steps: sha256: {{ .WASMEDGE_AMD64_SHA256 }} sha512: {{ .WASMEDGE_AMD64_SHA512 }} # {{ end }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | mkdir -p /rootfs/usr/local/bin diff --git a/container-runtime/wasmedge/vars.yaml b/container-runtime/wasmedge/vars.yaml index fcf44a2..828404a 100644 --- a/container-runtime/wasmedge/vars.yaml +++ b/container-runtime/wasmedge/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .WASMEDGE_VERSION }}" +TIER: "extra" diff --git a/container-runtime/youki/manifest.yaml b/container-runtime/youki/manifest.yaml.tmpl similarity index 52% rename from container-runtime/youki/manifest.yaml rename to container-runtime/youki/manifest.yaml.tmpl index 72cd3fd..01ae716 100644 --- a/container-runtime/youki/manifest.yaml +++ b/container-runtime/youki/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: youki - version: "$VERSION" + version: "{{ .VERSION }}" author: 0xBrandon description: | - This system extension provides youki using containerd's runtime handler. + [{{ .TIER }}] This system extension provides youki using containerd's runtime handler. compatibility: talos: version: ">= v1.9.0" diff --git a/container-runtime/youki/pkg.yaml b/container-runtime/youki/pkg.yaml index 01c6e6a..20721c8 100644 --- a/container-runtime/youki/pkg.yaml +++ b/container-runtime/youki/pkg.yaml @@ -16,9 +16,6 @@ steps: sha256: {{ .YOUKI_AMD64_SHA256 }} sha512: {{ .YOUKI_AMD64_SHA512 }} # {{ end }} - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | mkdir -p /rootfs/usr/local/bin diff --git a/container-runtime/youki/vars.yaml b/container-runtime/youki/vars.yaml index 9f1c46a..94ff4a6 100644 --- a/container-runtime/youki/vars.yaml +++ b/container-runtime/youki/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .YOUKI_VERSION }}" +TIER: "contrib" diff --git a/drivers/amazon-ena/manifest.yaml b/drivers/amazon-ena/manifest.yaml.tmpl similarity index 63% rename from drivers/amazon-ena/manifest.yaml rename to drivers/amazon-ena/manifest.yaml.tmpl index adca2f5..31e1752 100644 --- a/drivers/amazon-ena/manifest.yaml +++ b/drivers/amazon-ena/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: amazon-ena - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides Amazon ENA kernel modules built against a specific Talos version. + [{{ .TIER }}] This system extension provides Amazon ENA kernel modules built against a specific Talos version. ENA is a networking interface designed to make good use of modern CPU features and system architectures. compatibility: talos: diff --git a/drivers/amazon-ena/pkg.yaml b/drivers/amazon-ena/pkg.yaml index 13c78e8..1996ace 100644 --- a/drivers/amazon-ena/pkg.yaml +++ b/drivers/amazon-ena/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/ena-pkg:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules diff --git a/drivers/amazon-ena/vars.yaml b/drivers/amazon-ena/vars.yaml index 87d0695..c1ec0ad 100644 --- a/drivers/amazon-ena/vars.yaml +++ b/drivers/amazon-ena/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .ENA_VERSION }}-{{ .BUILD_ARG_TAG }}" +TIER: "core" diff --git a/drivers/chelsio/manifest.yaml b/drivers/chelsio/manifest.yaml.tmpl similarity index 58% rename from drivers/chelsio/manifest.yaml rename to drivers/chelsio/manifest.yaml.tmpl index 88a3b93..0b031d2 100644 --- a/drivers/chelsio/manifest.yaml +++ b/drivers/chelsio/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: chelsio-drivers - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides Chelsio network drivers. + [{{ .TIER }}] This system extension provides Chelsio network drivers. compatibility: talos: version: ">= v1.5.0" diff --git a/drivers/chelsio/pkg.yaml b/drivers/chelsio/pkg.yaml index 355c9af..332448a 100644 --- a/drivers/chelsio/pkg.yaml +++ b/drivers/chelsio/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) diff --git a/drivers/chelsio/vars.yaml b/drivers/chelsio/vars.yaml index f380ba7..2e1f859 100644 --- a/drivers/chelsio/vars.yaml +++ b/drivers/chelsio/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/drivers/gasket/manifest.yaml b/drivers/gasket/manifest.yaml.tmpl similarity index 66% rename from drivers/gasket/manifest.yaml rename to drivers/gasket/manifest.yaml.tmpl index 8730ba3..e9dd4ed 100644 --- a/drivers/gasket/manifest.yaml +++ b/drivers/gasket/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: gasket-driver - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides google gasket driver kernel modules built against a specific Talos version. + [{{ .TIER }}] This system extension provides google gasket driver kernel modules built against a specific Talos version. This driver is required for PCIe and M.2 Google Coral accelerators. There are 2 kernel modules ("gasket" and "apex") required to enable this driver. compatibility: diff --git a/drivers/gasket/pkg.yaml b/drivers/gasket/pkg.yaml index 1ec9ee9..e8b6a7a 100644 --- a/drivers/gasket/pkg.yaml +++ b/drivers/gasket/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/gasket-driver-pkg:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules diff --git a/drivers/gasket/vars.yaml b/drivers/gasket/vars.yaml index 33fdc67..8c5ae27 100644 --- a/drivers/gasket/vars.yaml +++ b/drivers/gasket/vars.yaml @@ -1,2 +1,3 @@ # update when pkgs version is updated VERSION: "5815ee3-{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/drivers/hailort/manifest.yaml b/drivers/hailort/manifest.yaml deleted file mode 100644 index cbe42bf..0000000 --- a/drivers/hailort/manifest.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1alpha1 -metadata: - name: hailort - version: "$VERSION" - author: hailo.ai team - description: | - Driver for HailoRT family of AI hardware (eg. Hailo-8L) and is required for PCIe and M.2 Hailo accelerators. - compatibility: - talos: - version: ">= v1.9.0" diff --git a/drivers/hailort/manifest.yaml.tmpl b/drivers/hailort/manifest.yaml.tmpl new file mode 100644 index 0000000..db4256e --- /dev/null +++ b/drivers/hailort/manifest.yaml.tmpl @@ -0,0 +1,10 @@ +version: v1alpha1 +metadata: + name: hailort + version: "{{ .VERSION }}" + author: hailo.ai team + description: | + [{{ .TIER }}] Driver for HailoRT family of AI hardware (eg. Hailo-8L) and is required for PCIe and M.2 Hailo accelerators. + compatibility: + talos: + version: ">= v1.9.0" diff --git a/drivers/hailort/pkg.yaml b/drivers/hailort/pkg.yaml index d106337..884fa3a 100644 --- a/drivers/hailort/pkg.yaml +++ b/drivers/hailort/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/hailort-pkg:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules/ diff --git a/drivers/hailort/vars.yaml b/drivers/hailort/vars.yaml index 744c0e2..1cc08fb 100644 --- a/drivers/hailort/vars.yaml +++ b/drivers/hailort/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .HAILORT_VERSION }}" +TIER: "extra" diff --git a/drivers/mei/manifest.yaml b/drivers/mei/manifest.yaml.tmpl similarity index 58% rename from drivers/mei/manifest.yaml rename to drivers/mei/manifest.yaml.tmpl index 8e256e9..25a92ff 100644 --- a/drivers/mei/manifest.yaml +++ b/drivers/mei/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: mei - version: "$VERSION" + version: "{{ .VERSION }}" author: Nick Meyer description: | - This system extension provides Intel Management Engine drivers kernel modules built against a specific Talos version. + [{{ .TIER }}] This system extension provides Intel Management Engine drivers kernel modules built against a specific Talos version. This driver enables the Intel Management Engine, a prerequisite for Intel Arc discrete GPUs. compatibility: talos: diff --git a/drivers/mei/pkg.yaml b/drivers/mei/pkg.yaml index 8450baa..9ad5f07 100644 --- a/drivers/mei/pkg.yaml +++ b/drivers/mei/pkg.yaml @@ -9,8 +9,6 @@ dependencies: steps: - prepare: - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - mkdir -p /rootfs # {{ if eq .ARCH "x86_64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - install: diff --git a/drivers/mei/vars.yaml b/drivers/mei/vars.yaml index f380ba7..20ba794 100644 --- a/drivers/mei/vars.yaml +++ b/drivers/mei/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "core" diff --git a/drivers/mellanox-ofed/manifest.yaml b/drivers/mellanox-ofed/manifest.yaml deleted file mode 100644 index 654e423..0000000 --- a/drivers/mellanox-ofed/manifest.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1alpha1 -metadata: - name: mellanox-ofed - version: "$VERSION" - author: Sidero Labs - description: | - This system extension provides kernel module driver for Mellanox OFED built against a specific Talos version. - compatibility: - talos: - version: ">= v1.3.0" diff --git a/drivers/mellanox-ofed/pkg.yaml b/drivers/mellanox-ofed/pkg.yaml deleted file mode 100644 index 0e13b32..0000000 --- a/drivers/mellanox-ofed/pkg.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: mellanox-ofed -variant: scratch -shell: /bin/bash -dependencies: - - stage: base - # The pkgs version for a particular release of Talos as defined in - # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/mellanox-ofed-pkg:{{ .BUILD_ARG_PKGS }}" -steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - - install: - - | - mkdir -p /rootfs/usr/lib/modules - - cp -R /usr/lib/modules/* /rootfs/usr/lib/modules - - test: - - | - mkdir -p /extensions-validator-rootfs - cp -r /rootfs/ /extensions-validator-rootfs/rootfs - cp /pkg/manifest.yaml /extensions-validator-rootfs/manifest.yaml - /extensions-validator validate --rootfs=/extensions-validator-rootfs --pkg-name="${PKG_NAME}" -finalize: - - from: /rootfs - to: /rootfs - - from: /pkg/manifest.yaml - to: / diff --git a/drivers/mellanox-ofed/vars.yaml b/drivers/mellanox-ofed/vars.yaml deleted file mode 100644 index 21a2f92..0000000 --- a/drivers/mellanox-ofed/vars.yaml +++ /dev/null @@ -1,2 +0,0 @@ -# the first part is the driver version and the second the talos version for which the module is built against -VERSION: "5.8-1.1.2.1-{{ .BUILD_ARG_TAG }}" diff --git a/drivers/tenstorrent/manifest.yaml b/drivers/tenstorrent/manifest.yaml.tmpl similarity index 61% rename from drivers/tenstorrent/manifest.yaml rename to drivers/tenstorrent/manifest.yaml.tmpl index 25ec524..c5b1a7e 100644 --- a/drivers/tenstorrent/manifest.yaml +++ b/drivers/tenstorrent/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: tenstorrent - version: "$VERSION" + version: "{{ .VERSION }}" author: Tenstorrent AI ULC description: | - Driver for Tenstorrent AI processing hardware + [{{ .TIER }}] Driver for Tenstorrent AI processing hardware compatibility: talos: version: ">= v1.9.0" diff --git a/drivers/tenstorrent/pkg.yaml b/drivers/tenstorrent/pkg.yaml index 824025d..da86641 100644 --- a/drivers/tenstorrent/pkg.yaml +++ b/drivers/tenstorrent/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/tenstorrent-pkg:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules diff --git a/drivers/tenstorrent/vars.yaml b/drivers/tenstorrent/vars.yaml index f5590c3..342c1b9 100644 --- a/drivers/tenstorrent/vars.yaml +++ b/drivers/tenstorrent/vars.yaml @@ -1,2 +1,3 @@ # update when pkgs version is updated VERSION: "{{ .TENSTORRENT_VERSION }}" +TIER: "extra" diff --git a/drivers/thunderbolt/manifest.yaml b/drivers/thunderbolt/manifest.yaml.tmpl similarity index 71% rename from drivers/thunderbolt/manifest.yaml rename to drivers/thunderbolt/manifest.yaml.tmpl index d874b86..909df9e 100644 --- a/drivers/thunderbolt/manifest.yaml +++ b/drivers/thunderbolt/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: thunderbolt - version: "$VERSION" + version: "{{ .VERSION}}" author: Igor Rzegocki description: | - This system extension provides Thunderbolt/USB4 drivers kernel modules built against a specific Talos version. + [{{ .TIER }}] This system extension provides Thunderbolt/USB4 drivers kernel modules built against a specific Talos version. It enables support for Thunderbolt/USB4 devices, including those used for networking. WARNING: This extension automatically authorizes all Thunderbolt devices during system boot, which poses potential security risks. Use at your own discretion. compatibility: diff --git a/drivers/thunderbolt/pkg.yaml b/drivers/thunderbolt/pkg.yaml index 230102a..ce50a1f 100644 --- a/drivers/thunderbolt/pkg.yaml +++ b/drivers/thunderbolt/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) diff --git a/drivers/thunderbolt/vars.yaml b/drivers/thunderbolt/vars.yaml index f380ba7..2e1f859 100644 --- a/drivers/thunderbolt/vars.yaml +++ b/drivers/thunderbolt/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/drivers/uinput/manifest.yaml b/drivers/uinput/manifest.yaml.tmpl similarity index 61% rename from drivers/uinput/manifest.yaml rename to drivers/uinput/manifest.yaml.tmpl index acf65c1..a9b0d65 100644 --- a/drivers/uinput/manifest.yaml +++ b/drivers/uinput/manifest.yaml.tmpl @@ -1,13 +1,13 @@ version: v1alpha1 metadata: name: uinput - version: "$VERSION" + version: "{{ .VERSION }}" author: Judah Rand description: | - This system extension provides the uinput kernel module built against a specific Talos version. - This kernel module makes it possible to emulate input devices from userspace. By writing to - /dev/uinput (or /dev/input/uinput) device, a process can create a virtual input device with - specific capabilities. Once this virtual device is created, the process can send events through it, + [{{ .TIER }}] This system extension provides the uinput kernel module built against a specific Talos version. + This kernel module makes it possible to emulate input devices from userspace. By writing to + /dev/uinput (or /dev/input/uinput) device, a process can create a virtual input device with + specific capabilities. Once this virtual device is created, the process can send events through it, that will be delivered to userspace and in-kernel consumers. compatibility: talos: diff --git a/drivers/uinput/pkg.yaml b/drivers/uinput/pkg.yaml index e8a51c7..42c304a 100644 --- a/drivers/uinput/pkg.yaml +++ b/drivers/uinput/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) diff --git a/drivers/uinput/vars.yaml b/drivers/uinput/vars.yaml index f380ba7..2e1f859 100644 --- a/drivers/uinput/vars.yaml +++ b/drivers/uinput/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/drivers/usb-modem/manifest.yaml b/drivers/usb-modem/manifest.yaml.tmpl similarity index 74% rename from drivers/usb-modem/manifest.yaml rename to drivers/usb-modem/manifest.yaml.tmpl index 552ba7b..b2f0d09 100644 --- a/drivers/usb-modem/manifest.yaml +++ b/drivers/usb-modem/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: usb-modem-drivers - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides USB modem drivers kernel modules built against a specific Talos version. + [{{ .TIER }}] This system extension provides USB modem drivers kernel modules built against a specific Talos version. This driver is required for USB modems to function. This extension includes all the drivers needed to operate any USB modem under Linux, but your device might not require all of them. Read your device's docs to learn which drivers you need, or just enable them all as a starting point. diff --git a/drivers/usb-modem/pkg.yaml b/drivers/usb-modem/pkg.yaml index bc17829..e5b9b50 100644 --- a/drivers/usb-modem/pkg.yaml +++ b/drivers/usb-modem/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) diff --git a/drivers/usb-modem/vars.yaml b/drivers/usb-modem/vars.yaml index f380ba7..2e1f859 100644 --- a/drivers/usb-modem/vars.yaml +++ b/drivers/usb-modem/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/drivers/v4l-uvc/manifest.yaml b/drivers/v4l-uvc/manifest.yaml.tmpl similarity index 53% rename from drivers/v4l-uvc/manifest.yaml rename to drivers/v4l-uvc/manifest.yaml.tmpl index 257240b..6e88158 100644 --- a/drivers/v4l-uvc/manifest.yaml +++ b/drivers/v4l-uvc/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: v4l-uvc-drivers - version: "$VERSION" + version: "{{ .VERSION }}" author: Jacob McSwain description: | - This system extension provides the Video4Linux kernel modules required for USB Video Class devices built against a specific Talos version. + [{{ .TIER }}] This system extension provides the Video4Linux kernel modules required for USB Video Class devices built against a specific Talos version. This driver enables Video4Linux devices such as webcams. compatibility: talos: diff --git a/drivers/v4l-uvc/pkg.yaml b/drivers/v4l-uvc/pkg.yaml index 3d0244b..bc55a0a 100644 --- a/drivers/v4l-uvc/pkg.yaml +++ b/drivers/v4l-uvc/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) diff --git a/drivers/v4l-uvc/vars.yaml b/drivers/v4l-uvc/vars.yaml index f380ba7..2e1f859 100644 --- a/drivers/v4l-uvc/vars.yaml +++ b/drivers/v4l-uvc/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/drivers/xdma-driver/manifest.yaml b/drivers/xdma-driver/manifest.yaml.tmpl similarity index 69% rename from drivers/xdma-driver/manifest.yaml rename to drivers/xdma-driver/manifest.yaml.tmpl index d4374f4..2e4f7ed 100644 --- a/drivers/xdma-driver/manifest.yaml +++ b/drivers/xdma-driver/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: xdma-driver - version: "$VERSION" + version: "{{ .VERSION }}" author: Nikolai Shields description: | - Xilinx DMA Driver + [{{ .TIER }}] Xilinx DMA Driver compatibility: talos: version: ">= v1.2.0" diff --git a/drivers/xdma-driver/pkg.yaml b/drivers/xdma-driver/pkg.yaml index fa5f38a..15d4999 100644 --- a/drivers/xdma-driver/pkg.yaml +++ b/drivers/xdma-driver/pkg.yaml @@ -7,16 +7,11 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/xdma-driver-pkg:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules cp -R /usr/lib/modules/* /rootfs/usr/lib/modules - - test: - - | finalize: - from: /rootfs to: /rootfs diff --git a/drivers/xdma-driver/vars.yaml b/drivers/xdma-driver/vars.yaml index 110ade8..88c3b76 100644 --- a/drivers/xdma-driver/vars.yaml +++ b/drivers/xdma-driver/vars.yaml @@ -1,2 +1,3 @@ # update when pkgs version is updated VERSION: "aefa9a1-{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/drm/amdgpu/manifest.yaml b/drm/amdgpu/manifest.yaml.tmpl similarity index 52% rename from drm/amdgpu/manifest.yaml rename to drm/amdgpu/manifest.yaml.tmpl index 10fed7e..cbc5f37 100644 --- a/drm/amdgpu/manifest.yaml +++ b/drm/amdgpu/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: amdgpu - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides AMDGPU firmware binaries and kernel modules. + [{{ .TIER }}] This system extension provides AMDGPU firmware binaries and kernel modules. compatibility: talos: version: ">= v1.0.0" diff --git a/drm/amdgpu/pkg.yaml b/drm/amdgpu/pkg.yaml index 70222fe..24aaac8 100644 --- a/drm/amdgpu/pkg.yaml +++ b/drm/amdgpu/pkg.yaml @@ -10,8 +10,6 @@ dependencies: steps: - prepare: - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - mkdir -p /rootfs # {{ if eq .ARCH "x86_64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - install: diff --git a/drm/amdgpu/vars.yaml b/drm/amdgpu/vars.yaml index 65478e1..1f4e00e 100644 --- a/drm/amdgpu/vars.yaml +++ b/drm/amdgpu/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .LINUX_FIRMWARE_VERSION }}-{{ .BUILD_ARG_TAG }}" +TIER: "core" diff --git a/drm/i915/manifest.yaml b/drm/i915/manifest.yaml.tmpl similarity index 51% rename from drm/i915/manifest.yaml rename to drm/i915/manifest.yaml.tmpl index e355ce2..bd891b0 100644 --- a/drm/i915/manifest.yaml +++ b/drm/i915/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: i915 - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides Intel GPU microcode binaries and kernel modules. + [{{ .TIER }}] This system extension provides Intel GPU microcode binaries and kernel modules. compatibility: talos: version: ">= v1.0.0" diff --git a/drm/i915/pkg.yaml b/drm/i915/pkg.yaml index 7fc1f70..4cfa802 100644 --- a/drm/i915/pkg.yaml +++ b/drm/i915/pkg.yaml @@ -10,8 +10,6 @@ dependencies: steps: - prepare: - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - mkdir -p /rootfs # {{ if eq .ARCH "x86_64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - install: diff --git a/drm/i915/vars.yaml b/drm/i915/vars.yaml index 65478e1..1f4e00e 100644 --- a/drm/i915/vars.yaml +++ b/drm/i915/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .LINUX_FIRMWARE_VERSION }}-{{ .BUILD_ARG_TAG }}" +TIER: "core" diff --git a/drm/panfrost/manifest.yaml b/drm/panfrost/manifest.yaml deleted file mode 100644 index 55cf85e..0000000 --- a/drm/panfrost/manifest.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1alpha1 -metadata: - name: panfrost - version: "$VERSION" - author: Adam Cirillo - description: | - This system extension provides ARM Mali Midgard, Bifrost, and Valhall firmware binaries and kernel modules. - compatibility: - talos: - version: ">= v1.0.0" diff --git a/drm/panfrost/manifest.yaml.tmpl b/drm/panfrost/manifest.yaml.tmpl new file mode 100644 index 0000000..66f7eae --- /dev/null +++ b/drm/panfrost/manifest.yaml.tmpl @@ -0,0 +1,10 @@ +version: v1alpha1 +metadata: + name: panfrost + version: "{{ .VERSION }}" + author: Adam Cirillo + description: | + [{{ .TIER }}] This system extension provides ARM Mali Midgard, Bifrost, and Valhall firmware binaries and kernel modules. + compatibility: + talos: + version: ">= v1.0.0" diff --git a/drm/panfrost/pkg.yaml b/drm/panfrost/pkg.yaml index 796c985..7373c35 100644 --- a/drm/panfrost/pkg.yaml +++ b/drm/panfrost/pkg.yaml @@ -11,8 +11,6 @@ dependencies: steps: - prepare: - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - mkdir -p /rootfs - install: - | @@ -41,8 +39,6 @@ dependencies: - stage: base steps: - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | mkdir /rootfs finalize: diff --git a/drm/panfrost/vars.yaml b/drm/panfrost/vars.yaml index 65478e1..4bf801e 100644 --- a/drm/panfrost/vars.yaml +++ b/drm/panfrost/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .LINUX_FIRMWARE_VERSION }}-{{ .BUILD_ARG_TAG }}" +TIER: "contrib" diff --git a/drm/vc4/manifest.yaml b/drm/vc4/manifest.yaml.tmpl similarity index 52% rename from drm/vc4/manifest.yaml rename to drm/vc4/manifest.yaml.tmpl index 678a64c..dccd5c4 100644 --- a/drm/vc4/manifest.yaml +++ b/drm/vc4/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: vc4 - version: "$VERSION" + version: "{{ .VERSION }}" author: Gluo NV description: | - This system extension provides kernel modules for Broadcom VideoCore GPU. + [{{ .TIER }}] This system extension provides kernel modules for Broadcom VideoCore GPU. compatibility: talos: version: ">= v1.10.0" diff --git a/drm/vc4/pkg.yaml b/drm/vc4/pkg.yaml index 3b8e7e6..ef45362 100644 --- a/drm/vc4/pkg.yaml +++ b/drm/vc4/pkg.yaml @@ -10,8 +10,6 @@ dependencies: steps: - prepare: - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - mkdir -p /rootfs - install: - | @@ -40,8 +38,6 @@ dependencies: - stage: base steps: - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | mkdir /rootfs finalize: diff --git a/drm/vc4/vars.yaml b/drm/vc4/vars.yaml index f380ba7..2e1f859 100644 --- a/drm/vc4/vars.yaml +++ b/drm/vc4/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/dvb/cx23885/manifest.yaml b/dvb/cx23885/manifest.yaml deleted file mode 100644 index 1d7c641..0000000 --- a/dvb/cx23885/manifest.yaml +++ /dev/null @@ -1,11 +0,0 @@ -version: v1alpha1 -metadata: - name: dvb-cx23885 - version: "$VERSION" - author: Skyler Mäntysaari - description: | - This system extension provides the dvb kernel modules required for Hauppage WinTV-quadHD PCIe tuner built against a specific Talos version. - Includes the firmware required. - compatibility: - talos: - version: ">= v1.9.0" diff --git a/dvb/cx23885/manifest.yaml.tmpl b/dvb/cx23885/manifest.yaml.tmpl new file mode 100644 index 0000000..c52d5a1 --- /dev/null +++ b/dvb/cx23885/manifest.yaml.tmpl @@ -0,0 +1,11 @@ +version: v1alpha1 +metadata: + name: dvb-cx23885 + version: "{{ .VERSION }}" + author: Skyler Mäntysaari + description: | + [{{ .TIER }}] This system extension provides the dvb kernel modules required for Hauppage WinTV-quadHD PCIe tuner built against a specific Talos version. + Includes the firmware required. + compatibility: + talos: + version: ">= v1.9.0" diff --git a/dvb/cx23885/pkg.yaml b/dvb/cx23885/pkg.yaml index b8a2b2b..38b7d88 100644 --- a/dvb/cx23885/pkg.yaml +++ b/dvb/cx23885/pkg.yaml @@ -15,8 +15,6 @@ steps: sha512: {{ .LINUX_DVB_FIRMWARE_SHA512 }} prepare: - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - mkdir -p /rootfs # {{ if eq .ARCH "x86_64" }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - | diff --git a/dvb/cx23885/vars.yaml b/dvb/cx23885/vars.yaml index f380ba7..819dd3e 100644 --- a/dvb/cx23885/vars.yaml +++ b/dvb/cx23885/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "contrib" diff --git a/dvb/dvb-m88ds3103/manifest.yaml b/dvb/dvb-m88ds3103/manifest.yaml.tmpl similarity index 64% rename from dvb/dvb-m88ds3103/manifest.yaml rename to dvb/dvb-m88ds3103/manifest.yaml.tmpl index 69b813a..370ada7 100644 --- a/dvb/dvb-m88ds3103/manifest.yaml +++ b/dvb/dvb-m88ds3103/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: dvb-m88ds3103 - version: "$VERSION" + version: "{{ .VERSION }}" author: Yehia Amer description: | - This system extension provides the dvb-demod-m88ds3103.fw firmware for DVB-S/S2 PCIe cards like DVBSky S952. + [{{ .TIER }}] This system extension provides the dvb-demod-m88ds3103.fw firmware for DVB-S/S2 PCIe cards like DVBSky S952. It is intended to be used as a dependency on existing DVB driver extension dvb-cx23885 that provides the necessary kernel modules. compatibility: talos: diff --git a/dvb/dvb-m88ds3103/pkg.yaml b/dvb/dvb-m88ds3103/pkg.yaml index c2c743a..5573360 100644 --- a/dvb/dvb-m88ds3103/pkg.yaml +++ b/dvb/dvb-m88ds3103/pkg.yaml @@ -16,8 +16,6 @@ steps: sha512: 6db7c7e18a630cc0ac665f7baededb08b8ab475ef0d93590b01c4c165aef9165f9d8e0014d65b5f39a2f71e859d8865074e6143045b31ee5814f88239df4595d prepare: - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - mkdir -p /rootfs install: - | @@ -43,8 +41,6 @@ dependencies: - stage: base steps: - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | mkdir /rootfs finalize: diff --git a/dvb/dvb-m88ds3103/vars.yaml b/dvb/dvb-m88ds3103/vars.yaml index f380ba7..819dd3e 100644 --- a/dvb/dvb-m88ds3103/vars.yaml +++ b/dvb/dvb-m88ds3103/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "contrib" diff --git a/examples/hello-world-service/manifest.yaml b/examples/hello-world-service/manifest.yaml.tmpl similarity index 57% rename from examples/hello-world-service/manifest.yaml rename to examples/hello-world-service/manifest.yaml.tmpl index 583c534..f77d377 100644 --- a/examples/hello-world-service/manifest.yaml +++ b/examples/hello-world-service/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: hello-world-service - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides an example Talos extension service. + [{{ .TIER }}] This system extension provides an example Talos extension service. compatibility: talos: version: ">= v1.0.0" diff --git a/examples/hello-world-service/pkg.yaml b/examples/hello-world-service/pkg.yaml index e225990..e60bcf0 100644 --- a/examples/hello-world-service/pkg.yaml +++ b/examples/hello-world-service/pkg.yaml @@ -9,9 +9,6 @@ steps: cachePaths: - /.cache/go-build - /tmp/go/pkg - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml build: - | cd /pkg/src diff --git a/examples/hello-world-service/vars.yaml b/examples/hello-world-service/vars.yaml index bc8ad19..bad93ff 100644 --- a/examples/hello-world-service/vars.yaml +++ b/examples/hello-world-service/vars.yaml @@ -1 +1,2 @@ VERSION: "v1.0.0" +TIER: "core" diff --git a/firmware/amd-ucode/manifest.yaml b/firmware/amd-ucode/manifest.yaml.tmpl similarity index 58% rename from firmware/amd-ucode/manifest.yaml rename to firmware/amd-ucode/manifest.yaml.tmpl index a6dcb1a..60c8722 100644 --- a/firmware/amd-ucode/manifest.yaml +++ b/firmware/amd-ucode/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: amd-ucode - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides AMD microcode binaries. + [{{ .TIER }}] This system extension provides AMD microcode binaries. compatibility: talos: version: ">= v1.0.0" diff --git a/firmware/amd-ucode/pkg.yaml b/firmware/amd-ucode/pkg.yaml index a14e1bb..dbfbe17 100644 --- a/firmware/amd-ucode/pkg.yaml +++ b/firmware/amd-ucode/pkg.yaml @@ -5,10 +5,7 @@ dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/usr/lib/firmware cp -R -p /usr/lib/firmware/amd-ucode /rootfs/usr/lib/firmware diff --git a/firmware/amd-ucode/vars.yaml b/firmware/amd-ucode/vars.yaml index 4d4aca4..14dc8f1 100644 --- a/firmware/amd-ucode/vars.yaml +++ b/firmware/amd-ucode/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .LINUX_FIRMWARE_VERSION }}" +TIER: "core" diff --git a/firmware/bnx2-bnx2x/manifest.yaml b/firmware/bnx2-bnx2x/manifest.yaml.tmpl similarity index 58% rename from firmware/bnx2-bnx2x/manifest.yaml rename to firmware/bnx2-bnx2x/manifest.yaml.tmpl index 2704ee9..e2e540e 100644 --- a/firmware/bnx2-bnx2x/manifest.yaml +++ b/firmware/bnx2-bnx2x/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: bnx2-bnx2x - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides bnx2 and bnx2x binaries. + [{{ .TIER }}]This system extension provides bnx2 and bnx2x binaries. compatibility: talos: version: ">= v1.0.0" diff --git a/firmware/bnx2-bnx2x/pkg.yaml b/firmware/bnx2-bnx2x/pkg.yaml index e8636fa..87dc39e 100644 --- a/firmware/bnx2-bnx2x/pkg.yaml +++ b/firmware/bnx2-bnx2x/pkg.yaml @@ -5,10 +5,7 @@ dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/usr/lib/firmware cp -R -p /usr/lib/firmware/bnx2 /rootfs/usr/lib/firmware diff --git a/firmware/bnx2-bnx2x/vars.yaml b/firmware/bnx2-bnx2x/vars.yaml index 4d4aca4..14dc8f1 100644 --- a/firmware/bnx2-bnx2x/vars.yaml +++ b/firmware/bnx2-bnx2x/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .LINUX_FIRMWARE_VERSION }}" +TIER: "core" diff --git a/firmware/chelsio/manifest.yaml b/firmware/chelsio/manifest.yaml.tmpl similarity index 57% rename from firmware/chelsio/manifest.yaml rename to firmware/chelsio/manifest.yaml.tmpl index d438787..88deba1 100644 --- a/firmware/chelsio/manifest.yaml +++ b/firmware/chelsio/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: chelsio-firmware - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides Chelsio NIC firmware binaries. + [{{ .TIER }}] This system extension provides Chelsio NIC firmware binaries. compatibility: talos: version: ">= v1.0.0" diff --git a/firmware/chelsio/pkg.yaml b/firmware/chelsio/pkg.yaml index e125efd..4272ba3 100644 --- a/firmware/chelsio/pkg.yaml +++ b/firmware/chelsio/pkg.yaml @@ -5,10 +5,7 @@ dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/usr/lib/firmware cp -R -p /usr/lib/firmware/cxgb3 /rootfs/usr/lib/firmware diff --git a/firmware/chelsio/vars.yaml b/firmware/chelsio/vars.yaml index 4d4aca4..ce4bded 100644 --- a/firmware/chelsio/vars.yaml +++ b/firmware/chelsio/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .LINUX_FIRMWARE_VERSION }}" +TIER: "contrib" diff --git a/firmware/intel-ice-firmware/manifest.yaml b/firmware/intel-ice-firmware/manifest.yaml.tmpl similarity index 58% rename from firmware/intel-ice-firmware/manifest.yaml rename to firmware/intel-ice-firmware/manifest.yaml.tmpl index ad82eb1..7fe5146 100644 --- a/firmware/intel-ice-firmware/manifest.yaml +++ b/firmware/intel-ice-firmware/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: intel-ice-firmware - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides Intel Ice firmware binaries. + [{{ .TIER }}] This system extension provides Intel Ice firmware binaries. compatibility: talos: version: ">= v1.0.0" diff --git a/firmware/intel-ice-firmware/pkg.yaml b/firmware/intel-ice-firmware/pkg.yaml index 1bb2ce8..5d519df 100644 --- a/firmware/intel-ice-firmware/pkg.yaml +++ b/firmware/intel-ice-firmware/pkg.yaml @@ -5,10 +5,7 @@ dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/usr/lib/firmware/intel/ice/ddp cp /usr/lib/firmware/intel/ice/ddp/ice-*.pkg /rootfs/usr/lib/firmware/intel/ice/ddp/ice.pkg diff --git a/firmware/intel-ice-firmware/vars.yaml b/firmware/intel-ice-firmware/vars.yaml index 4d4aca4..14dc8f1 100644 --- a/firmware/intel-ice-firmware/vars.yaml +++ b/firmware/intel-ice-firmware/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .LINUX_FIRMWARE_VERSION }}" +TIER: "core" diff --git a/firmware/intel-ucode/manifest.yaml b/firmware/intel-ucode/manifest.yaml.tmpl similarity index 57% rename from firmware/intel-ucode/manifest.yaml rename to firmware/intel-ucode/manifest.yaml.tmpl index 06e39eb..44a6b73 100644 --- a/firmware/intel-ucode/manifest.yaml +++ b/firmware/intel-ucode/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: intel-ucode - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides Intel microcode binaries. + [{{ .TIER }}] This system extension provides Intel microcode binaries. compatibility: talos: version: ">= v1.0.0" diff --git a/firmware/intel-ucode/pkg.yaml b/firmware/intel-ucode/pkg.yaml index 930793e..d3339c1 100644 --- a/firmware/intel-ucode/pkg.yaml +++ b/firmware/intel-ucode/pkg.yaml @@ -10,8 +10,6 @@ steps: sha256: {{ .INTEL_UCODE_SHA256 }} sha512: {{ .INTEL_UCODE_SHA512 }} prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xzf intel-ucode.tar.gz --strip-components=1 install: diff --git a/firmware/intel-ucode/vars.yaml b/firmware/intel-ucode/vars.yaml index 08aab83..a7ce291 100644 --- a/firmware/intel-ucode/vars.yaml +++ b/firmware/intel-ucode/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .INTEL_UCODE_VERSION }}" +TIER: "core" diff --git a/firmware/qlogic-firmware/manifest.yaml b/firmware/qlogic-firmware/manifest.yaml.tmpl similarity index 57% rename from firmware/qlogic-firmware/manifest.yaml rename to firmware/qlogic-firmware/manifest.yaml.tmpl index 2ad550c..476db9d 100644 --- a/firmware/qlogic-firmware/manifest.yaml +++ b/firmware/qlogic-firmware/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: qlogic-firmware - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides firmware for QLogic devices. + [{{ .TIER }}] This system extension provides firmware for QLogic devices. compatibility: talos: version: ">= v1.0.0" diff --git a/firmware/qlogic-firmware/pkg.yaml b/firmware/qlogic-firmware/pkg.yaml index e00cad4..8a5b384 100644 --- a/firmware/qlogic-firmware/pkg.yaml +++ b/firmware/qlogic-firmware/pkg.yaml @@ -5,10 +5,7 @@ dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/usr/lib/firmware cp -R -p /usr/lib/firmware/qed /rootfs/usr/lib/firmware diff --git a/firmware/qlogic-firmware/vars.yaml b/firmware/qlogic-firmware/vars.yaml index 4d4aca4..14dc8f1 100644 --- a/firmware/qlogic-firmware/vars.yaml +++ b/firmware/qlogic-firmware/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .LINUX_FIRMWARE_VERSION }}" +TIER: "core" diff --git a/firmware/realtek-firmware/manifest.yaml b/firmware/realtek-firmware/manifest.yaml.tmpl similarity index 58% rename from firmware/realtek-firmware/manifest.yaml rename to firmware/realtek-firmware/manifest.yaml.tmpl index 1eabb86..b3eed54 100644 --- a/firmware/realtek-firmware/manifest.yaml +++ b/firmware/realtek-firmware/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: realtek-firmware - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides realtek firmware binaries. + [{{ .TIER }}] This system extension provides realtek firmware binaries. compatibility: talos: version: ">= v1.0.0" diff --git a/firmware/realtek-firmware/pkg.yaml b/firmware/realtek-firmware/pkg.yaml index 2fc023b..942bd6c 100644 --- a/firmware/realtek-firmware/pkg.yaml +++ b/firmware/realtek-firmware/pkg.yaml @@ -5,10 +5,7 @@ dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/usr/lib/firmware cp -R -p /usr/lib/firmware/rtl_bt /rootfs/usr/lib/firmware diff --git a/firmware/realtek-firmware/vars.yaml b/firmware/realtek-firmware/vars.yaml index 4d4aca4..14dc8f1 100644 --- a/firmware/realtek-firmware/vars.yaml +++ b/firmware/realtek-firmware/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .LINUX_FIRMWARE_VERSION }}" +TIER: "core" diff --git a/firmware/revpi-firmware/manifest.yaml b/firmware/revpi-firmware/manifest.yaml.tmpl similarity index 52% rename from firmware/revpi-firmware/manifest.yaml rename to firmware/revpi-firmware/manifest.yaml.tmpl index acccd66..a0f76b5 100644 --- a/firmware/revpi-firmware/manifest.yaml +++ b/firmware/revpi-firmware/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: revpi-firmware - version: "$VERSION" + version: "{{ .VERSION }}" author: STACKIT description: | - This system extension provides tools e.g. udev rules for the RevolutionPi platform. + [{{ .TIER }}] This system extension provides tools e.g. udev rules for the RevolutionPi platform. compatibility: talos: version: ">= v1.0.0" diff --git a/firmware/revpi-firmware/pkg.yaml b/firmware/revpi-firmware/pkg.yaml index 936d293..81cca8e 100644 --- a/firmware/revpi-firmware/pkg.yaml +++ b/firmware/revpi-firmware/pkg.yaml @@ -12,7 +12,6 @@ steps: - network: default prepare: - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml cd /pkg/src go mod download build: diff --git a/firmware/revpi-firmware/vars.yaml b/firmware/revpi-firmware/vars.yaml index bc8ad19..883adba 100644 --- a/firmware/revpi-firmware/vars.yaml +++ b/firmware/revpi-firmware/vars.yaml @@ -1 +1,2 @@ VERSION: "v1.0.0" +TIER: "contrib" diff --git a/guest-agents/metal-agent/manifest.yaml b/guest-agents/metal-agent/manifest.yaml.tmpl similarity index 61% rename from guest-agents/metal-agent/manifest.yaml rename to guest-agents/metal-agent/manifest.yaml.tmpl index a6362cb..59967c3 100644 --- a/guest-agents/metal-agent/manifest.yaml +++ b/guest-agents/metal-agent/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: metal-agent - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides talos-metal-agent + [{{ .TIER }}] This system extension provides talos-metal-agent compatibility: talos: version: ">= 1.9.0-alpha.0" diff --git a/guest-agents/metal-agent/pkg.yaml b/guest-agents/metal-agent/pkg.yaml index a6b9972..f5e0cbd 100644 --- a/guest-agents/metal-agent/pkg.yaml +++ b/guest-agents/metal-agent/pkg.yaml @@ -8,10 +8,7 @@ dependencies: from: / to: /rootfs/usr/local/lib/containers/metal-agent steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/usr/local/etc/containers diff --git a/guest-agents/metal-agent/vars.yaml b/guest-agents/metal-agent/vars.yaml index 73dcbef..3138d99 100644 --- a/guest-agents/metal-agent/vars.yaml +++ b/guest-agents/metal-agent/vars.yaml @@ -1,2 +1,3 @@ VERSION: "{{ .TALOS_METAL_AGENT_VERSION }}" IMAGE_PREFIX: ghcr.io/siderolabs +TIER: "core" diff --git a/guest-agents/qemu-guest-agent/manifest.yaml b/guest-agents/qemu-guest-agent/manifest.yaml.tmpl similarity index 58% rename from guest-agents/qemu-guest-agent/manifest.yaml rename to guest-agents/qemu-guest-agent/manifest.yaml.tmpl index 90d70e1..5158709 100644 --- a/guest-agents/qemu-guest-agent/manifest.yaml +++ b/guest-agents/qemu-guest-agent/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: qemu-guest-agent - version: "$VERSION" + version: "{{ .VERSION }}" author: Markus Reiter description: | - This system extension provides the QEMU Guest Agent service. + [{{ .TIER }}] This system extension provides the QEMU Guest Agent service. compatibility: talos: version: ">= v1.5.0" diff --git a/guest-agents/qemu-guest-agent/pkg.yaml b/guest-agents/qemu-guest-agent/pkg.yaml index dcf3767..6a9a505 100644 --- a/guest-agents/qemu-guest-agent/pkg.yaml +++ b/guest-agents/qemu-guest-agent/pkg.yaml @@ -12,8 +12,6 @@ steps: sha256: {{ .QEMU_SHA256 }} sha512: {{ .QEMU_SHA512 }} prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xf qemu.tar.xz --strip-components=1 rm qemu.tar.xz diff --git a/guest-agents/qemu-guest-agent/vars.yaml b/guest-agents/qemu-guest-agent/vars.yaml index d06458c..9b7f861 100644 --- a/guest-agents/qemu-guest-agent/vars.yaml +++ b/guest-agents/qemu-guest-agent/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .QEMU_VERSION }}" +TIER: "extra" diff --git a/guest-agents/vmtoolsd-guest-agent/stub-manifest.yaml b/guest-agents/vmtoolsd-guest-agent/manifest.yaml.tmpl similarity index 62% rename from guest-agents/vmtoolsd-guest-agent/stub-manifest.yaml rename to guest-agents/vmtoolsd-guest-agent/manifest.yaml.tmpl index fe78560..f2e2986 100644 --- a/guest-agents/vmtoolsd-guest-agent/stub-manifest.yaml +++ b/guest-agents/vmtoolsd-guest-agent/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: vmtoolsd-guest-agent - version: "$VERSION" + version: "{{ .VERSION }}" author: Brandon Nason description: | - A stub for the VMWare Tools on arm64 (unavailable on arm64). + [{{ .TIER }}] This system extension provides talos-vmtoolsd compatibility: talos: version: ">= v1.4.0" diff --git a/guest-agents/vmtoolsd-guest-agent/pkg.yaml b/guest-agents/vmtoolsd-guest-agent/pkg.yaml index ce4fbb8..5736dce 100644 --- a/guest-agents/vmtoolsd-guest-agent/pkg.yaml +++ b/guest-agents/vmtoolsd-guest-agent/pkg.yaml @@ -9,6 +9,7 @@ dependencies: steps: - test: - | + cp /pkg/manifest.yaml /rootfs/manifest.yaml /extensions-validator validate --rootfs=/rootfs --pkg-name="${PKG_NAME}" sbom: outputPath: /rootfs/usr/local/share/spdx/vmtoolsd-guest-agent.spdx.json @@ -18,3 +19,5 @@ steps: finalize: - from: /rootfs to: / + - from: /pkg/manifest.yaml + to: / diff --git a/guest-agents/vmtoolsd-guest-agent/vars.yaml b/guest-agents/vmtoolsd-guest-agent/vars.yaml index a6c8ffb..217b621 100644 --- a/guest-agents/vmtoolsd-guest-agent/vars.yaml +++ b/guest-agents/vmtoolsd-guest-agent/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .TALOS_VMTOOLSD_VERSION }}" +TIER: "extra" diff --git a/guest-agents/xen-guest-agent/manifest.yaml b/guest-agents/xen-guest-agent/manifest.yaml.tmpl similarity index 54% rename from guest-agents/xen-guest-agent/manifest.yaml rename to guest-agents/xen-guest-agent/manifest.yaml.tmpl index 2de530a..17b09f3 100644 --- a/guest-agents/xen-guest-agent/manifest.yaml +++ b/guest-agents/xen-guest-agent/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: xen-guest-agent - version: "$VERSION" + version: "{{ .VERSION }}" author: Jerwin NJ description: | - xen-guest-agent communicates information and metrics with the Xen host. + [{{ .TIER }}] xen-guest-agent communicates information and metrics with the Xen host. compatibility: talos: version: ">= v1.5.0" diff --git a/guest-agents/xen-guest-agent/pkg.yaml b/guest-agents/xen-guest-agent/pkg.yaml index 9213523..721326c 100644 --- a/guest-agents/xen-guest-agent/pkg.yaml +++ b/guest-agents/xen-guest-agent/pkg.yaml @@ -22,8 +22,6 @@ steps: destination: xe-guest-agent.tar.gz - network: default prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xzvf xe-guest-agent.tar.gz --strip-components=1 - | diff --git a/guest-agents/xen-guest-agent/vars.yaml b/guest-agents/xen-guest-agent/vars.yaml index 27c7d88..2fafde1 100644 --- a/guest-agents/xen-guest-agent/vars.yaml +++ b/guest-agents/xen-guest-agent/vars.yaml @@ -1,3 +1,4 @@ # VERSION: "{{ .XEN_GUEST_AGENT_VERSION }}" # FIXME: Replace once a building tag is available VERSION: "0.4.0-g5c274e6" +TIER: "extra" diff --git a/hack/catalog.template b/hack/catalog.template new file mode 100644 index 0000000..fa7b2f5 --- /dev/null +++ b/hack/catalog.template @@ -0,0 +1,58 @@ +{{ define "description" }} +{{- range .TemplatedFiles -}} +{{- if eq .Path "manifest.yaml" -}} +{{- $manifest := .Content | toString | mustFromYAML -}} +{{- $description := index $manifest "metadata" "description" | replace "\n" " " -}} +{{- regexReplaceAll "\\[\\w+\\]" $description "" -}} +{{ end -}} +{{ end -}} +{{ end -}} + +{{ define "extension-list" }} +| Name | Tier | Image | Version | Description | +| ---- | ---- | ----- | ------- | ----------- | +{{- $tiers := (dict "core" ":green_square:" "extra" ":yellow_square:" "contrib" ":white_large_square:") }} +{{ range .Pkgs -}} +{{ if hasPrefix $.BaseDir .Pkg.BaseDir -}} +{{ if not .Pkg.Context.INTERNAL_PACKAGE -}} +| [{{ .Pkg.Name }}]({{ .Pkg.BaseDir }}) | {{ index $tiers .Pkg.Context.TIER }} {{ .Pkg.Context.TIER }} | [ghcr.io/siderolabs/{{ .Pkg.Name }}](https://github.com/siderolabs/extensions/pkgs/container/{{ .Pkg.Name }}) | `{{ .Pkg.Context.VERSION }}` | {{ template "description" .Pkg -}} | +{{ end }} +{{- end }} +{{- end }} +{{ end -}} + +### Container Runtimes +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "container-runtime/") -}} + +### Firmware +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "firmware/") -}} + +### Direct Rendering Manager (DRM) +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "drm/") -}} + +### Drivers +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "drivers/") -}} + +### Digital Video Broadcasting (DVB) +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "dvb/") -}} + +### Miscellaneous +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "misc/") -}} + +### Network +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "network/") -}} + +### Storage +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "storage/") -}} + +### Power +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "power/") -}} + +### Guest Agents +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "guest-agents/") -}} + +### NVIDIA GPU +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "nvidia-gpu/") -}} + +### Tools +{{ template "extension-list" (dict "Pkgs" . "BaseDir" "tools/") -}} diff --git a/misc/binfmt-misc/manifest.yaml b/misc/binfmt-misc/manifest.yaml deleted file mode 100644 index f290bf1..0000000 --- a/misc/binfmt-misc/manifest.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1alpha1 -metadata: - name: binfmt-misc - version: "$VERSION" - author: Serge Logvinov - description: | - This system extension provides kernel module driver for binfmt-misc built against a specific Talos version. - compatibility: - talos: - version: ">= v1.5.0" diff --git a/misc/binfmt-misc/manifest.yaml.tmpl b/misc/binfmt-misc/manifest.yaml.tmpl new file mode 100644 index 0000000..f37ca7f --- /dev/null +++ b/misc/binfmt-misc/manifest.yaml.tmpl @@ -0,0 +1,10 @@ +version: v1alpha1 +metadata: + name: binfmt-misc + version: "{{ .VERSION }}" + author: Serge Logvinov + description: | + [{{ .TIER }}] This system extension provides kernel module driver for binfmt-misc built against a specific Talos version. + compatibility: + talos: + version: ">= v1.5.0" diff --git a/misc/binfmt-misc/pkg.yaml b/misc/binfmt-misc/pkg.yaml index df74304..e28a17a 100644 --- a/misc/binfmt-misc/pkg.yaml +++ b/misc/binfmt-misc/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) diff --git a/misc/binfmt-misc/vars.yaml b/misc/binfmt-misc/vars.yaml index f380ba7..2e1f859 100644 --- a/misc/binfmt-misc/vars.yaml +++ b/misc/binfmt-misc/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/misc/glibc/manifest.yaml b/misc/glibc/manifest.yaml.tmpl similarity index 63% rename from misc/glibc/manifest.yaml rename to misc/glibc/manifest.yaml.tmpl index 4842805..3c3371f 100644 --- a/misc/glibc/manifest.yaml +++ b/misc/glibc/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: glibc - version: "$VERSION" + version: "{{ .VERSION }}" author: Jean-Francois Roy description: | - This system extension provides glibc. + [{{ .TIER }}]This system extension provides glibc. compatibility: talos: version: ">= v1.9.0" diff --git a/misc/glibc/pkg.yaml b/misc/glibc/pkg.yaml index 3c5e939..c08070e 100644 --- a/misc/glibc/pkg.yaml +++ b/misc/glibc/pkg.yaml @@ -20,8 +20,6 @@ steps: sha256: {{ .GLIBC_SHA256 }} sha512: {{ .GLIBC_SHA512 }} prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xf glibc.tar.xz --strip-components=1 diff --git a/misc/glibc/vars.yaml b/misc/glibc/vars.yaml index 5a05dc3..13fbf0a 100644 --- a/misc/glibc/vars.yaml +++ b/misc/glibc/vars.yaml @@ -2,3 +2,5 @@ WOLFI_BASE_REF: sha256:aaf69a3f822e069db4be5047e9a0c5d25dd78396d9e0ea5e718b8e542978981e VERSION: {{ .GLIBC_VERSION }} + +TIER: "core" diff --git a/network/cloudflared/manifest.yaml b/network/cloudflared/manifest.yaml.tmpl similarity index 75% rename from network/cloudflared/manifest.yaml rename to network/cloudflared/manifest.yaml.tmpl index 49201e6..5db6e43 100644 --- a/network/cloudflared/manifest.yaml +++ b/network/cloudflared/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: cloudflared - version: "$CLOUDFLARED_VERSION" + version: "{{ .VERSION }}" author: Maxime Narbaud description: | - Cloudflare Tunnel securely connects resources to Cloudflare without a public IP. + [{{ .TIER }}] Cloudflare Tunnel securely connects resources to Cloudflare without a public IP. A lightweight daemon (cloudflared) creates outbound-only connections to Cloudflare, allowing safe access to services like HTTP, SSH, remote desktops, and other protocols. More info: https://github.com/cloudflare/cloudflared/ diff --git a/network/cloudflared/pkg.yaml b/network/cloudflared/pkg.yaml index ec4be64..91f1912 100644 --- a/network/cloudflared/pkg.yaml +++ b/network/cloudflared/pkg.yaml @@ -16,9 +16,6 @@ steps: sha256: {{ .CLOUDFLARED_AMD64_SHA256 }} sha512: {{ .CLOUDFLARED_AMD64_SHA512 }} # {{ end }} This in fact is YAML comment, but Go templating instruction is evaluated by bldr - prepare: - - | - sed -i 's#$CLOUDFLARED_VERSION#{{ .CLOUDFLARED_VERSION }}#' /pkg/manifest.yaml install: - | mkdir -p /rootfs/usr/local/lib/containers/cloudflared/usr/local/bin diff --git a/network/cloudflared/vars.yaml b/network/cloudflared/vars.yaml index 8c6ce96..c5cec0b 100644 --- a/network/cloudflared/vars.yaml +++ b/network/cloudflared/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .CLOUDFLARED_VERSION }}" +TIER: "contrib" diff --git a/network/lldpd/manifest.yaml b/network/lldpd/manifest.yaml.tmpl similarity index 62% rename from network/lldpd/manifest.yaml rename to network/lldpd/manifest.yaml.tmpl index a4fa8ee..6c885da 100644 --- a/network/lldpd/manifest.yaml +++ b/network/lldpd/manifest.yaml.tmpl @@ -4,10 +4,10 @@ version: v1alpha1 metadata: name: lldpd - version: "$VERSION" + version: "{{ .VERSION }}" author: Niklas Wik description: | - LLDP adds a LLDP discovery service to Talos. LLDP cli can be used to interface with the daemon. + [{{ .TIER }}] LLDP adds a LLDP discovery service to Talos. LLDP cli can be used to interface with the daemon. compatibility: talos: version: ">= v1.7.0" diff --git a/network/lldpd/pkg.yaml b/network/lldpd/pkg.yaml index 775a201..a643b27 100644 --- a/network/lldpd/pkg.yaml +++ b/network/lldpd/pkg.yaml @@ -15,8 +15,6 @@ steps: env: SOURCE_DATE_EPOCH: {{ .BUILD_ARG_SOURCE_DATE_EPOCH }} prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xf lldpd.tar.gz --strip-components=1 diff --git a/network/lldpd/vars.yaml b/network/lldpd/vars.yaml index f3e20b3..a9b9cf8 100644 --- a/network/lldpd/vars.yaml +++ b/network/lldpd/vars.yaml @@ -2,3 +2,4 @@ # Licensed under the Mozilla Public License 2.0 # SPDX-License-Identifier: MPL-2.0 VERSION: "{{ .LLDPD_VERSION }}" +TIER: "extra" diff --git a/network/nebula/manifest.yaml b/network/nebula/manifest.yaml.tmpl similarity index 50% rename from network/nebula/manifest.yaml rename to network/nebula/manifest.yaml.tmpl index b5c3c17..86189e7 100644 --- a/network/nebula/manifest.yaml +++ b/network/nebula/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nebula - version: "$VERSION" + version: "{{ .VERSION }}" author: iamwacko description: | - A scalable overlay networking tool with a focus on performance, simplicity and security + [{{ .TIER }}] A scalable overlay networking tool with a focus on performance, simplicity and security compatibility: talos: version: ">= v1.5.0" diff --git a/network/nebula/pkg.yaml b/network/nebula/pkg.yaml index fd60810..76e0bf9 100644 --- a/network/nebula/pkg.yaml +++ b/network/nebula/pkg.yaml @@ -16,8 +16,6 @@ steps: sha512: {{ .NEBULA_SHA512 }} - network: default prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | mkdir nebula tar -xzvf nebula.tar.gz --strip-components=1 -C nebula diff --git a/network/nebula/vars.yaml b/network/nebula/vars.yaml index ad88e57..125472b 100644 --- a/network/nebula/vars.yaml +++ b/network/nebula/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .NEBULA_VERSION }}" +TIER: "contrib" diff --git a/network/newt/manifest.yaml b/network/newt/manifest.yaml.tmpl similarity index 58% rename from network/newt/manifest.yaml rename to network/newt/manifest.yaml.tmpl index 64b310a..634e830 100644 --- a/network/newt/manifest.yaml +++ b/network/newt/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: newt - version: "$NEWT_VERSION" + version: "{{ .VERSION }}" author: Fossorial description: | - Newt is a fully user space WireGuard tunnel client and TCP/UDP proxy, designed to securely expose private resources controlled by Pangolin. + [{{ .TIER }}] Newt is a fully user space WireGuard tunnel client and TCP/UDP proxy, designed to securely expose private resources controlled by Pangolin. By using Newt, you don't need to manage complex WireGuard tunnels and NATing. More info: https://github.com/fosrl/newt compatibility: diff --git a/network/newt/pkg.yaml b/network/newt/pkg.yaml index 4f91bab..fd04ff9 100644 --- a/network/newt/pkg.yaml +++ b/network/newt/pkg.yaml @@ -16,8 +16,6 @@ steps: sha512: {{ .NEWT_SHA512 }} - network: default prepare: - - | - sed -i 's#$NEWT_VERSION#{{ .NEWT_VERSION }}#' /pkg/manifest.yaml - | mkdir newt tar -xzvf newt.tar.gz --strip-components=1 -C newt diff --git a/network/newt/vars.yaml b/network/newt/vars.yaml index 6f116a2..79c76b7 100644 --- a/network/newt/vars.yaml +++ b/network/newt/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .NEWT_VERSION }}" +TIER: "contrib" diff --git a/network/tailscale/manifest.yaml b/network/tailscale/manifest.yaml deleted file mode 100644 index 1f8d76c..0000000 --- a/network/tailscale/manifest.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1alpha1 -metadata: - name: tailscale - version: "$VERSION" - author: Beau Trepp - description: | - Tailscale connects your team's devices and development environments for easy access to remote resources. - compatibility: - talos: - version: ">= v1.5.0" diff --git a/network/tailscale/manifest.yaml.tmpl b/network/tailscale/manifest.yaml.tmpl new file mode 100644 index 0000000..6dcb316 --- /dev/null +++ b/network/tailscale/manifest.yaml.tmpl @@ -0,0 +1,10 @@ +version: v1alpha1 +metadata: + name: tailscale + version: "{{ .VERSION }}" + author: Beau Trepp + description: | + [{{ .TIER }}] Tailscale connects your team's devices and development environments for easy access to remote resources. + compatibility: + talos: + version: ">= v1.5.0" diff --git a/network/tailscale/pkg.yaml b/network/tailscale/pkg.yaml index 34a2928..da2225d 100644 --- a/network/tailscale/pkg.yaml +++ b/network/tailscale/pkg.yaml @@ -16,8 +16,6 @@ steps: sha512: {{ .TAILSCALE_SHA512 }} - network: default prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | mkdir tailscale dist tar -xzvf tailscale.tar.gz --strip-components=1 -C tailscale diff --git a/network/tailscale/vars.yaml b/network/tailscale/vars.yaml index 76e631a..9f801a8 100644 --- a/network/tailscale/vars.yaml +++ b/network/tailscale/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .TAILSCALE_VERSION }}" +TIER: "extra" diff --git a/network/zerotier/manifest.yaml b/network/zerotier/manifest.yaml.tmpl similarity index 59% rename from network/zerotier/manifest.yaml rename to network/zerotier/manifest.yaml.tmpl index e53ce0d..17f7abd 100644 --- a/network/zerotier/manifest.yaml +++ b/network/zerotier/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: zerotier - version: "$VERSION" + version: "{{ .VERSION }}" author: Hive Technologies description: | - Connect your Talos cluster into a zerotier network + [{{ .TIER }}] Connect your Talos cluster into a zerotier network compatibility: talos: version: ">= v1.8.0" diff --git a/network/zerotier/pkg.yaml b/network/zerotier/pkg.yaml index 05182c1..a977e2e 100644 --- a/network/zerotier/pkg.yaml +++ b/network/zerotier/pkg.yaml @@ -15,8 +15,6 @@ steps: CXXFLAGS: '-Os -fstack-protector -std=c++17 -pthread' LDFLAGS: '-static' prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xzvf zerotier.tar.gz --strip-components=1 build: diff --git a/network/zerotier/vars.yaml b/network/zerotier/vars.yaml index 7d89fa5..85617eb 100644 --- a/network/zerotier/vars.yaml +++ b/network/zerotier/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .ZEROTIER_VERSION }}" +TIER: "contrib" diff --git a/network/zerotier/zerotier-wrapper/vars.yaml b/network/zerotier/zerotier-wrapper/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/network/zerotier/zerotier-wrapper/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/nvidia-gpu/nonfree/kmod-nvidia/lts/manifest.yaml b/nvidia-gpu/nonfree/kmod-nvidia/lts/manifest.yaml.tmpl similarity index 50% rename from nvidia-gpu/nonfree/kmod-nvidia/lts/manifest.yaml rename to nvidia-gpu/nonfree/kmod-nvidia/lts/manifest.yaml.tmpl index 0571c0a..a2cbecf 100644 --- a/nvidia-gpu/nonfree/kmod-nvidia/lts/manifest.yaml +++ b/nvidia-gpu/nonfree/kmod-nvidia/lts/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nonfree-kmod-nvidia-lts - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides nvidia proprietary kernel modules built against a specific Talos version. + [{{ .TIER }}] This system extension provides nvidia proprietary kernel modules built against a specific Talos version. compatibility: talos: version: ">= v1.5.0" diff --git a/nvidia-gpu/nonfree/kmod-nvidia/lts/pkg.yaml b/nvidia-gpu/nonfree/kmod-nvidia/lts/pkg.yaml index 0813164..21a63a5 100644 --- a/nvidia-gpu/nonfree/kmod-nvidia/lts/pkg.yaml +++ b/nvidia-gpu/nonfree/kmod-nvidia/lts/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/nonfree-kmod-nvidia-lts-pkg:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules \ diff --git a/nvidia-gpu/nonfree/kmod-nvidia/lts/vars.yaml b/nvidia-gpu/nonfree/kmod-nvidia/lts/vars.yaml index fa402e1..3409ad9 100644 --- a/nvidia-gpu/nonfree/kmod-nvidia/lts/vars.yaml +++ b/nvidia-gpu/nonfree/kmod-nvidia/lts/vars.yaml @@ -1,2 +1,3 @@ # the first part is the driver version and the second the talos version for which the module is built against VERSION: "{{ .NVIDIA_DRIVER_LTS_VERSION }}-{{ .BUILD_ARG_TAG }}" +TIER: "core" diff --git a/nvidia-gpu/nonfree/kmod-nvidia/production/manifest.yaml b/nvidia-gpu/nonfree/kmod-nvidia/production/manifest.yaml.tmpl similarity index 51% rename from nvidia-gpu/nonfree/kmod-nvidia/production/manifest.yaml rename to nvidia-gpu/nonfree/kmod-nvidia/production/manifest.yaml.tmpl index f6ecfb8..9ccff61 100644 --- a/nvidia-gpu/nonfree/kmod-nvidia/production/manifest.yaml +++ b/nvidia-gpu/nonfree/kmod-nvidia/production/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nonfree-kmod-nvidia-production - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides nvidia proprietary kernel modules built against a specific Talos version. + [{{ .TIER }}] This system extension provides nvidia proprietary kernel modules built against a specific Talos version. compatibility: talos: version: ">= v1.5.0" diff --git a/nvidia-gpu/nonfree/kmod-nvidia/production/pkg.yaml b/nvidia-gpu/nonfree/kmod-nvidia/production/pkg.yaml index 509f5b2..735561f 100644 --- a/nvidia-gpu/nonfree/kmod-nvidia/production/pkg.yaml +++ b/nvidia-gpu/nonfree/kmod-nvidia/production/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/nonfree-kmod-nvidia-production-pkg:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules \ diff --git a/nvidia-gpu/nonfree/kmod-nvidia/production/vars.yaml b/nvidia-gpu/nonfree/kmod-nvidia/production/vars.yaml index b377850..d4c8528 100644 --- a/nvidia-gpu/nonfree/kmod-nvidia/production/vars.yaml +++ b/nvidia-gpu/nonfree/kmod-nvidia/production/vars.yaml @@ -1,2 +1,3 @@ # the first part is the driver version and the second the talos version for which the module is built against VERSION: "{{ .NVIDIA_DRIVER_PRODUCTION_VERSION }}-{{ .BUILD_ARG_TAG }}" +TIER: "core" diff --git a/nvidia-gpu/nvidia-container-toolkit/lts/manifest.yaml b/nvidia-gpu/nvidia-container-toolkit/lts/manifest.yaml.tmpl similarity index 52% rename from nvidia-gpu/nvidia-container-toolkit/lts/manifest.yaml rename to nvidia-gpu/nvidia-container-toolkit/lts/manifest.yaml.tmpl index a93c078..9934b3c 100644 --- a/nvidia-gpu/nvidia-container-toolkit/lts/manifest.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/lts/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nvidia-container-toolkit-lts - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides nvidia runtime and it's dependencies using NVIDIA's runtime handler. + [{{ .TIER }}] This system extension provides nvidia runtime and it's dependencies using NVIDIA's runtime handler. compatibility: talos: version: ">= v1.2.0" diff --git a/nvidia-gpu/nvidia-container-toolkit/lts/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/lts/pkg.yaml index 0cbf921..7438054 100644 --- a/nvidia-gpu/nvidia-container-toolkit/lts/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/lts/pkg.yaml @@ -13,10 +13,7 @@ dependencies: - stage: nvidia-container-runtime-wrapper - stage: nvidia-persistenced-wrapper steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/usr/local/etc/containers cp /pkg/nvidia-persistenced.yaml /rootfs/usr/local/etc/containers/nvidia-persistenced.yaml diff --git a/nvidia-gpu/nvidia-container-toolkit/lts/vars.yaml b/nvidia-gpu/nvidia-container-toolkit/lts/vars.yaml index 3896332..a095a8a 100644 --- a/nvidia-gpu/nvidia-container-toolkit/lts/vars.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/lts/vars.yaml @@ -1,2 +1,3 @@ # the first part is the driver version and the second the container-toolkit version VERSION: "{{ .NVIDIA_DRIVER_LTS_VERSION }}-{{ .CONTAINER_TOOLKIT_VERSION }}" +TIER: "core" diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/vars.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-cli/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime-wrapper/vars.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime-wrapper/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime-wrapper/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime/vars.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-container-runtime/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-persistenced-wrapper/vars.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-persistenced-wrapper/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-persistenced-wrapper/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/vars.yaml b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/nvidia-gpu/nvidia-container-toolkit/nvidia-pkgs/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/nvidia-gpu/nvidia-container-toolkit/production/manifest.yaml b/nvidia-gpu/nvidia-container-toolkit/production/manifest.yaml.tmpl similarity index 53% rename from nvidia-gpu/nvidia-container-toolkit/production/manifest.yaml rename to nvidia-gpu/nvidia-container-toolkit/production/manifest.yaml.tmpl index 49fc70a..c9f1784 100644 --- a/nvidia-gpu/nvidia-container-toolkit/production/manifest.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/production/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nvidia-container-toolkit-production - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides nvidia runtime and it's dependencies using NVIDIA's runtime handler. + [{{ .TIER }}] This system extension provides nvidia runtime and it's dependencies using NVIDIA's runtime handler. compatibility: talos: version: ">= v1.2.0" diff --git a/nvidia-gpu/nvidia-container-toolkit/production/pkg.yaml b/nvidia-gpu/nvidia-container-toolkit/production/pkg.yaml index 41dbcb5..059e2e1 100644 --- a/nvidia-gpu/nvidia-container-toolkit/production/pkg.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/production/pkg.yaml @@ -13,10 +13,7 @@ dependencies: - stage: nvidia-container-runtime-wrapper - stage: nvidia-persistenced-wrapper steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/usr/local/etc/containers cp /pkg/nvidia-persistenced.yaml /rootfs/usr/local/etc/containers/nvidia-persistenced.yaml diff --git a/nvidia-gpu/nvidia-container-toolkit/production/vars.yaml b/nvidia-gpu/nvidia-container-toolkit/production/vars.yaml index 58e7f16..71988a1 100644 --- a/nvidia-gpu/nvidia-container-toolkit/production/vars.yaml +++ b/nvidia-gpu/nvidia-container-toolkit/production/vars.yaml @@ -1,2 +1,3 @@ # the first part is the driver version and the second the container-toolkit version VERSION: "{{ .NVIDIA_DRIVER_PRODUCTION_VERSION }}-{{ .CONTAINER_TOOLKIT_VERSION }}" +TIER: "core" diff --git a/nvidia-gpu/nvidia-fabricmanager/lts/manifest.yaml b/nvidia-gpu/nvidia-fabricmanager/lts/manifest.yaml.tmpl similarity index 52% rename from nvidia-gpu/nvidia-fabricmanager/lts/manifest.yaml rename to nvidia-gpu/nvidia-fabricmanager/lts/manifest.yaml.tmpl index b1ba330..e11ebcf 100644 --- a/nvidia-gpu/nvidia-fabricmanager/lts/manifest.yaml +++ b/nvidia-gpu/nvidia-fabricmanager/lts/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nvidia-fabricmanager-lts - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides the Nvidia fabricmanager for GPU's that need NVLink support. + [{{ .TIER }}] This system extension provides the Nvidia fabricmanager for GPU's that need NVLink support. compatibility: talos: version: ">= v1.2.0" diff --git a/nvidia-gpu/nvidia-fabricmanager/lts/pkg.yaml b/nvidia-gpu/nvidia-fabricmanager/lts/pkg.yaml index 1c29047..3fb61c5 100644 --- a/nvidia-gpu/nvidia-fabricmanager/lts/pkg.yaml +++ b/nvidia-gpu/nvidia-fabricmanager/lts/pkg.yaml @@ -19,8 +19,6 @@ steps: prepare: - | tar -xf fabricmanager.tar.xz --strip-components=1 - - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | mkdir -p /rootfs/usr/local/bin \ diff --git a/nvidia-gpu/nvidia-fabricmanager/lts/vars.yaml b/nvidia-gpu/nvidia-fabricmanager/lts/vars.yaml index a948993..2f94ec1 100644 --- a/nvidia-gpu/nvidia-fabricmanager/lts/vars.yaml +++ b/nvidia-gpu/nvidia-fabricmanager/lts/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .NVIDIA_DRIVER_LTS_VERSION }}" +TIER: "core" diff --git a/nvidia-gpu/nvidia-fabricmanager/production/manifest.yaml b/nvidia-gpu/nvidia-fabricmanager/production/manifest.yaml.tmpl similarity index 54% rename from nvidia-gpu/nvidia-fabricmanager/production/manifest.yaml rename to nvidia-gpu/nvidia-fabricmanager/production/manifest.yaml.tmpl index 61ccc16..2c34407 100644 --- a/nvidia-gpu/nvidia-fabricmanager/production/manifest.yaml +++ b/nvidia-gpu/nvidia-fabricmanager/production/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nvidia-fabricmanager-production - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides the Nvidia fabricmanager for GPU's that need NVLink support. + [{{ .TIER }}] This system extension provides the Nvidia fabricmanager for GPU's that need NVLink support. compatibility: talos: version: ">= v1.2.0" diff --git a/nvidia-gpu/nvidia-fabricmanager/production/pkg.yaml b/nvidia-gpu/nvidia-fabricmanager/production/pkg.yaml index d12d717..d598858 100644 --- a/nvidia-gpu/nvidia-fabricmanager/production/pkg.yaml +++ b/nvidia-gpu/nvidia-fabricmanager/production/pkg.yaml @@ -19,8 +19,6 @@ steps: prepare: - | tar -xf fabricmanager.tar.xz --strip-components=1 - - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml install: - | mkdir -p /rootfs/usr/local/bin \ diff --git a/nvidia-gpu/nvidia-fabricmanager/production/vars.yaml b/nvidia-gpu/nvidia-fabricmanager/production/vars.yaml index 2a8ccd3..6e89953 100644 --- a/nvidia-gpu/nvidia-fabricmanager/production/vars.yaml +++ b/nvidia-gpu/nvidia-fabricmanager/production/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .NVIDIA_DRIVER_PRODUCTION_VERSION }}" +TIER: "core" diff --git a/nvidia-gpu/nvidia-modules/lts/manifest.yaml b/nvidia-gpu/nvidia-modules/lts/manifest.yaml.tmpl similarity index 51% rename from nvidia-gpu/nvidia-modules/lts/manifest.yaml rename to nvidia-gpu/nvidia-modules/lts/manifest.yaml.tmpl index 7787482..1f47e29 100644 --- a/nvidia-gpu/nvidia-modules/lts/manifest.yaml +++ b/nvidia-gpu/nvidia-modules/lts/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nvidia-open-gpu-kernel-modules-lts - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides nvidia open source driver kernel modules built against a specific Talos version. + [{{ .TIER }}] This system extension provides nvidia open source driver kernel modules built against a specific Talos version. compatibility: talos: version: ">= v1.2.0" diff --git a/nvidia-gpu/nvidia-modules/lts/pkg.yaml b/nvidia-gpu/nvidia-modules/lts/pkg.yaml index 52da1fb..45278f3 100644 --- a/nvidia-gpu/nvidia-modules/lts/pkg.yaml +++ b/nvidia-gpu/nvidia-modules/lts/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/nvidia-open-gpu-kernel-modules-lts-pkg:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules \ diff --git a/nvidia-gpu/nvidia-modules/lts/vars.yaml b/nvidia-gpu/nvidia-modules/lts/vars.yaml index fa402e1..3409ad9 100644 --- a/nvidia-gpu/nvidia-modules/lts/vars.yaml +++ b/nvidia-gpu/nvidia-modules/lts/vars.yaml @@ -1,2 +1,3 @@ # the first part is the driver version and the second the talos version for which the module is built against VERSION: "{{ .NVIDIA_DRIVER_LTS_VERSION }}-{{ .BUILD_ARG_TAG }}" +TIER: "core" diff --git a/nvidia-gpu/nvidia-modules/production/manifest.yaml b/nvidia-gpu/nvidia-modules/production/manifest.yaml.tmpl similarity index 52% rename from nvidia-gpu/nvidia-modules/production/manifest.yaml rename to nvidia-gpu/nvidia-modules/production/manifest.yaml.tmpl index 7398546..1cf96ed 100644 --- a/nvidia-gpu/nvidia-modules/production/manifest.yaml +++ b/nvidia-gpu/nvidia-modules/production/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nvidia-open-gpu-kernel-modules-production - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides nvidia open source driver kernel modules built against a specific Talos version. + [{{ .TIER }}] This system extension provides nvidia open source driver kernel modules built against a specific Talos version. compatibility: talos: version: ">= v1.2.0" diff --git a/nvidia-gpu/nvidia-modules/production/pkg.yaml b/nvidia-gpu/nvidia-modules/production/pkg.yaml index 9b46f3e..45b05df 100644 --- a/nvidia-gpu/nvidia-modules/production/pkg.yaml +++ b/nvidia-gpu/nvidia-modules/production/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/nvidia-open-gpu-kernel-modules-production-pkg:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules \ diff --git a/nvidia-gpu/nvidia-modules/production/vars.yaml b/nvidia-gpu/nvidia-modules/production/vars.yaml index b377850..d4c8528 100644 --- a/nvidia-gpu/nvidia-modules/production/vars.yaml +++ b/nvidia-gpu/nvidia-modules/production/vars.yaml @@ -1,2 +1,3 @@ # the first part is the driver version and the second the talos version for which the module is built against VERSION: "{{ .NVIDIA_DRIVER_PRODUCTION_VERSION }}-{{ .BUILD_ARG_TAG }}" +TIER: "core" diff --git a/power/nut-client/manifest.yaml b/power/nut-client/manifest.yaml.tmpl similarity index 55% rename from power/nut-client/manifest.yaml rename to power/nut-client/manifest.yaml.tmpl index 0540a14..1ca8822 100644 --- a/power/nut-client/manifest.yaml +++ b/power/nut-client/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nut-client - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides the network-ups-tools upsmon service. + [{{ .TIER }}] This system extension provides the network-ups-tools upsmon service. compatibility: talos: version: ">= v1.5.0" diff --git a/power/nut-client/pkg.yaml b/power/nut-client/pkg.yaml index 09c0580..0c28d27 100644 --- a/power/nut-client/pkg.yaml +++ b/power/nut-client/pkg.yaml @@ -10,8 +10,6 @@ steps: sha256: {{ .NUT_SHA256 }} sha512: {{ .NUT_SHA512 }} prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xf nut.tar.gz --strip-components=1 - | diff --git a/power/nut-client/vars.yaml b/power/nut-client/vars.yaml index bd3e21d..48f3e97 100644 --- a/power/nut-client/vars.yaml +++ b/power/nut-client/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .NUT_VERSION }}" +TIER: "contrib" diff --git a/storage/btrfs/manifest.yaml b/storage/btrfs/manifest.yaml deleted file mode 100644 index 6694d7a..0000000 --- a/storage/btrfs/manifest.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1alpha1 -metadata: - name: btrfs - version: "$VERSION" - author: Enno Boland - description: | - This system extension provides kernel module driver for BTRFS built against a specific Talos version. - compatibility: - talos: - version: ">= v1.5.0" diff --git a/storage/btrfs/manifest.yaml.tmpl b/storage/btrfs/manifest.yaml.tmpl new file mode 100644 index 0000000..6f1b956 --- /dev/null +++ b/storage/btrfs/manifest.yaml.tmpl @@ -0,0 +1,10 @@ +version: v1alpha1 +metadata: + name: btrfs + version: "{{ .VERSION }}" + author: Enno Boland + description: | + [{{ .TIER }}] This system extension provides kernel module driver for BTRFS built against a specific Talos version. + compatibility: + talos: + version: ">= v1.5.0" diff --git a/storage/btrfs/pkg.yaml b/storage/btrfs/pkg.yaml index dd82e8d..8ee7a66 100644 --- a/storage/btrfs/pkg.yaml +++ b/storage/btrfs/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) diff --git a/storage/btrfs/vars.yaml b/storage/btrfs/vars.yaml index f380ba7..2e1f859 100644 --- a/storage/btrfs/vars.yaml +++ b/storage/btrfs/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/storage/drbd/manifest.yaml b/storage/drbd/manifest.yaml deleted file mode 100644 index fc19d43..0000000 --- a/storage/drbd/manifest.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1alpha1 -metadata: - name: drbd - version: "$VERSION" - author: Alexander Prentki - description: | - This system extension provides kernel module driver for DRBD built against a specific Talos version. - compatibility: - talos: - version: ">= v1.2.0" diff --git a/storage/drbd/manifest.yaml.tmpl b/storage/drbd/manifest.yaml.tmpl new file mode 100644 index 0000000..9073fcf --- /dev/null +++ b/storage/drbd/manifest.yaml.tmpl @@ -0,0 +1,10 @@ +version: v1alpha1 +metadata: + name: drbd + version: "{{ .VERSION }}" + author: Alexander Prentki + description: | + [{{ .TIER }}] This system extension provides kernel module driver for DRBD built against a specific Talos version. + compatibility: + talos: + version: ">= v1.2.0" diff --git a/storage/drbd/pkg.yaml b/storage/drbd/pkg.yaml index da4bda2..23f8931 100644 --- a/storage/drbd/pkg.yaml +++ b/storage/drbd/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/drbd-pkg:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules diff --git a/storage/drbd/vars.yaml b/storage/drbd/vars.yaml index 108cc64..0ddbe9a 100644 --- a/storage/drbd/vars.yaml +++ b/storage/drbd/vars.yaml @@ -1,2 +1,3 @@ # the first part is the driver version and the second the talos version for which the module is built against VERSION: "{{ .DRBD_DRIVER_VERSION }}-{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/storage/fuse3/manifest.yaml b/storage/fuse3/manifest.yaml.tmpl similarity index 58% rename from storage/fuse3/manifest.yaml rename to storage/fuse3/manifest.yaml.tmpl index 5268434..caed6ac 100644 --- a/storage/fuse3/manifest.yaml +++ b/storage/fuse3/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: fuse3 - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides fuse3 functionality. + [{{ .TIER }}] This system extension provides fuse3 functionality. compatibility: talos: version: ">= v1.0.0" diff --git a/storage/fuse3/pkg.yaml b/storage/fuse3/pkg.yaml index 7bd1248..623ff51 100644 --- a/storage/fuse3/pkg.yaml +++ b/storage/fuse3/pkg.yaml @@ -10,8 +10,6 @@ steps: sha256: {{ .FUSE3_SHA256 }} sha512: {{ .FUSE3_SHA512 }} prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xzf fuse.tar.gz --strip-components=1 diff --git a/storage/fuse3/vars.yaml b/storage/fuse3/vars.yaml index 7aec66e..2800262 100644 --- a/storage/fuse3/vars.yaml +++ b/storage/fuse3/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .FUSE3_VERSION }}" +TIER: "core" diff --git a/storage/iscsi-tools/manifest.yaml b/storage/iscsi-tools/manifest.yaml.tmpl similarity index 61% rename from storage/iscsi-tools/manifest.yaml rename to storage/iscsi-tools/manifest.yaml.tmpl index cd649fb..a32edbd 100644 --- a/storage/iscsi-tools/manifest.yaml +++ b/storage/iscsi-tools/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: iscsi-tools - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides iscsi-tools. + [{{ .TIER }}] This system extension provides iscsi-tools. compatibility: talos: version: ">= v1.1.0" diff --git a/storage/iscsi-tools/open-iscsi/vars.yaml b/storage/iscsi-tools/open-iscsi/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/storage/iscsi-tools/open-iscsi/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/storage/iscsi-tools/pkg.yaml b/storage/iscsi-tools/pkg.yaml index 3197b0e..af2c4e7 100644 --- a/storage/iscsi-tools/pkg.yaml +++ b/storage/iscsi-tools/pkg.yaml @@ -11,8 +11,6 @@ steps: - | mkdir -p /rootfs/usr/local/lib/containers/iscsid - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - # cleanup rm -rf /rootfs/usr/local/include rm -rf /rootfs/usr/share diff --git a/storage/iscsi-tools/vars.yaml b/storage/iscsi-tools/vars.yaml index 4f3ece7..482fe3f 100644 --- a/storage/iscsi-tools/vars.yaml +++ b/storage/iscsi-tools/vars.yaml @@ -3,3 +3,5 @@ VERSION: v0.2.0 OPEN_ISCSI_VERSION: 2.1.11 OPEN_ISCSI_SHA256: f288d1823b15782432608e5f53723159562e2c44e9a72b40fe15a5ca064ac86a OPEN_ISCSI_SHA512: 5e7a160e675ce016123f703522758cbbf2ba3be6b97dc73a69b8ff0fe247c6d994c43ca67ebe6f21982bfa22eee27f2d08cbfc502767c0afc127852389411e4d + +TIER: "core" diff --git a/storage/mdadm/manifest.yaml b/storage/mdadm/manifest.yaml.tmpl similarity index 60% rename from storage/mdadm/manifest.yaml rename to storage/mdadm/manifest.yaml.tmpl index 60a19ef..8c2ece0 100644 --- a/storage/mdadm/manifest.yaml +++ b/storage/mdadm/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: mdadm - version: "$VERSION" + version: "{{ .VERSION }}" author: Serge Logvinov description: | - This system extension provides mdadm binary. + [{{ .TIER }}] This system extension provides mdadm binary. compatibility: talos: version: ">= v1.5.0" diff --git a/storage/mdadm/pkg.yaml b/storage/mdadm/pkg.yaml index 1ddccc9..43ae3d0 100644 --- a/storage/mdadm/pkg.yaml +++ b/storage/mdadm/pkg.yaml @@ -11,8 +11,6 @@ steps: sha256: {{ .MDADM_SHA256 }} sha512: {{ .MDADM_SHA512 }} prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xzf mdadm.tar.gz --strip-components=1 - | diff --git a/storage/mdadm/vars.yaml b/storage/mdadm/vars.yaml index d78d1ee..8074146 100644 --- a/storage/mdadm/vars.yaml +++ b/storage/mdadm/vars.yaml @@ -1 +1,2 @@ VERSION: "v{{ .MDADM_VERSION }}" +TIER: "contrib" diff --git a/storage/nfsd/manifest.yaml b/storage/nfsd/manifest.yaml deleted file mode 100644 index e63da05..0000000 --- a/storage/nfsd/manifest.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1alpha1 -metadata: - name: nfsd - version: "$VERSION" - author: Cameron Mehl - description: | - This system extension provides kernel module driver for NFSD built against a specific Talos version. - compatibility: - talos: - version: ">= v1.2.0" diff --git a/storage/nfsd/manifest.yaml.tmpl b/storage/nfsd/manifest.yaml.tmpl new file mode 100644 index 0000000..ce9bb62 --- /dev/null +++ b/storage/nfsd/manifest.yaml.tmpl @@ -0,0 +1,10 @@ +version: v1alpha1 +metadata: + name: nfsd + version: "{{ .VERSION }}" + author: Cameron Mehl + description: | + [{{ .TIER }}] This system extension provides kernel module driver for NFSD built against a specific Talos version. + compatibility: + talos: + version: ">= v1.2.0" diff --git a/storage/nfsd/pkg.yaml b/storage/nfsd/pkg.yaml index 399d8f7..6386cb8 100644 --- a/storage/nfsd/pkg.yaml +++ b/storage/nfsd/pkg.yaml @@ -7,9 +7,6 @@ dependencies: # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | export KERNELRELEASE=$(find /usr/lib/modules -type d -name "*-talos" -exec basename {} \+) diff --git a/storage/nfsd/vars.yaml b/storage/nfsd/vars.yaml index df6cc8d..829ff6b 100644 --- a/storage/nfsd/vars.yaml +++ b/storage/nfsd/vars.yaml @@ -1,2 +1,3 @@ # the first part is the driver version and the second the talos version for which the module is built against VERSION: "{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/storage/nfsrahead/libevent/vars.yaml b/storage/nfsrahead/libevent/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/storage/nfsrahead/libevent/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/storage/nfsrahead/manifest.yaml b/storage/nfsrahead/manifest.yaml.tmpl similarity index 50% rename from storage/nfsrahead/manifest.yaml rename to storage/nfsrahead/manifest.yaml.tmpl index 027e998..88297b8 100644 --- a/storage/nfsrahead/manifest.yaml +++ b/storage/nfsrahead/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nfsrahead - version: "$VERSION" + version: "{{ .VERSION }}" author: Steve Kreitzer description: | - This system extension provides nfsrahead, a tool to configure the readahead for NFS mounts. + [{{ .TIER }}] This system extension provides nfsrahead, a tool to configure the readahead for NFS mounts. compatibility: talos: version: ">= v1.2.0" diff --git a/storage/nfsrahead/pkg.yaml b/storage/nfsrahead/pkg.yaml index 64585d3..8f3fd96 100644 --- a/storage/nfsrahead/pkg.yaml +++ b/storage/nfsrahead/pkg.yaml @@ -18,8 +18,6 @@ steps: env: PKG_CONFIG_PATH: /usr/local/lib/pkgconfig prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - | tar -xf nfs-utils.tar.xz --strip-components=1 diff --git a/storage/nfsrahead/sqlite/vars.yaml b/storage/nfsrahead/sqlite/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/storage/nfsrahead/sqlite/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/storage/nfsrahead/vars.yaml b/storage/nfsrahead/vars.yaml index ac0963c..7544355 100644 --- a/storage/nfsrahead/vars.yaml +++ b/storage/nfsrahead/vars.yaml @@ -1 +1,2 @@ VERSION: {{ .NFS_UTILS_VERSION | replace "-" "." }} +TIER: "contrib" diff --git a/storage/zfs/manifest.yaml b/storage/zfs/manifest.yaml deleted file mode 100644 index 86d6090..0000000 --- a/storage/zfs/manifest.yaml +++ /dev/null @@ -1,10 +0,0 @@ -version: v1alpha1 -metadata: - name: zfs - version: "$VERSION" - author: Aenix, Enix - description: | - This system extension provides the ZFS kernel module, the ZFS utilities, and a service to import all ZFS pools on start and unmount all pools on stop. - compatibility: - talos: - version: ">= v1.6.0" diff --git a/storage/zfs/manifest.yaml.tmpl b/storage/zfs/manifest.yaml.tmpl new file mode 100644 index 0000000..4fd6f74 --- /dev/null +++ b/storage/zfs/manifest.yaml.tmpl @@ -0,0 +1,10 @@ +version: v1alpha1 +metadata: + name: zfs + version: "{{ .VERSION }}" + author: Aenix, Enix + description: | + [{{ .TIER }}] This system extension provides the ZFS kernel module, the ZFS utilities, and a service to import all ZFS pools on start and unmount all pools on stop. + compatibility: + talos: + version: ">= v1.6.0" diff --git a/storage/zfs/pkg.yaml b/storage/zfs/pkg.yaml index 94db9d7..995def3 100644 --- a/storage/zfs/pkg.yaml +++ b/storage/zfs/pkg.yaml @@ -11,9 +11,6 @@ dependencies: - stage: zfs-tools - stage: zfs-service steps: - - prepare: - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: - | mkdir -p /rootfs/usr/lib/modules diff --git a/storage/zfs/vars.yaml b/storage/zfs/vars.yaml index 7b745a3..31b8cb3 100644 --- a/storage/zfs/vars.yaml +++ b/storage/zfs/vars.yaml @@ -1,2 +1,3 @@ # the first part is the driver version and the second the talos version for which the module is built against VERSION: "{{ .ZFS_DRIVER_VERSION }}-{{ .BUILD_ARG_TAG }}" +TIER: "extra" diff --git a/storage/zfs/zfs-service/vars.yaml b/storage/zfs/zfs-service/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/storage/zfs/zfs-service/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/storage/zfs/zfs-tools/libtirpc/vars.yaml b/storage/zfs/zfs-tools/libtirpc/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/storage/zfs/zfs-tools/libtirpc/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/storage/zfs/zfs-tools/vars.yaml b/storage/zfs/zfs-tools/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/storage/zfs/zfs-tools/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/storage/zfs/zfs-tools/zlib/vars.yaml b/storage/zfs/zfs-tools/zlib/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/storage/zfs/zfs-tools/zlib/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/tools/ctr/manifest.yaml b/tools/ctr/manifest.yaml.tmpl similarity index 50% rename from tools/ctr/manifest.yaml rename to tools/ctr/manifest.yaml.tmpl index 4603af1..c96bb41 100644 --- a/tools/ctr/manifest.yaml +++ b/tools/ctr/manifest.yaml.tmpl @@ -1,9 +1,10 @@ version: v1alpha1 metadata: name: ctr - version: "$VERSION" + version: "{{ .VERSION }}" author: Tomasz Jonak - description: "This extension provides ctr containerd helper binary" + description: | + [{{ .TIER }}] This extension provides ctr containerd helper binary compatibility: talos: version: ">= v1.0.0" diff --git a/tools/ctr/pkg.yaml b/tools/ctr/pkg.yaml index 8ca1dd5..e4e5284 100644 --- a/tools/ctr/pkg.yaml +++ b/tools/ctr/pkg.yaml @@ -5,9 +5,7 @@ dependencies: - stage: base - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/containerd:{{ .BUILD_ARG_PKGS }}" steps: - - prepare: - - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml - install: + - install: - | mkdir -p /rootfs/usr/local/bin cp /usr/bin/ctr /rootfs/usr/local/bin diff --git a/tools/ctr/vars.yaml b/tools/ctr/vars.yaml index a3fd5d5..3a57b11 100644 --- a/tools/ctr/vars.yaml +++ b/tools/ctr/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .CONTAINERD_VERSION }}" +TIER: "core" diff --git a/tools/nvme-cli/libnvme/vars.yaml b/tools/nvme-cli/libnvme/vars.yaml new file mode 100644 index 0000000..f2bd455 --- /dev/null +++ b/tools/nvme-cli/libnvme/vars.yaml @@ -0,0 +1 @@ +INTERNAL_PACKAGE: true diff --git a/tools/nvme-cli/manifest.yaml b/tools/nvme-cli/manifest.yaml.tmpl similarity index 55% rename from tools/nvme-cli/manifest.yaml rename to tools/nvme-cli/manifest.yaml.tmpl index 0627f6b..3583d64 100644 --- a/tools/nvme-cli/manifest.yaml +++ b/tools/nvme-cli/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: nvme-cli - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides the NVMe command line interface. + [{{ .TIER }}] This system extension provides the NVMe command line interface. compatibility: talos: version: ">= v1.0.0" diff --git a/tools/nvme-cli/pkg.yaml b/tools/nvme-cli/pkg.yaml index ac857d7..e58e208 100644 --- a/tools/nvme-cli/pkg.yaml +++ b/tools/nvme-cli/pkg.yaml @@ -28,8 +28,6 @@ steps: -Ddocs=false \ -Dsysconfdir=/etc \ .build - - | - sed -i 's#$VERSION#{{ .NVME_CLI_VERSION }}#' /pkg/manifest.yaml build: - | meson compile -C .build diff --git a/tools/nvme-cli/vars.yaml b/tools/nvme-cli/vars.yaml index ecab4d6..04cea03 100644 --- a/tools/nvme-cli/vars.yaml +++ b/tools/nvme-cli/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .NVME_CLI_VERSION }}" +TIER: "contrib" diff --git a/tools/util-linux/manifest.yaml b/tools/util-linux/manifest.yaml.tmpl similarity index 57% rename from tools/util-linux/manifest.yaml rename to tools/util-linux/manifest.yaml.tmpl index 59aa98e..e612350 100644 --- a/tools/util-linux/manifest.yaml +++ b/tools/util-linux/manifest.yaml.tmpl @@ -1,10 +1,10 @@ version: v1alpha1 metadata: name: util-linux-tools - version: "$VERSION" + version: "{{ .VERSION }}" author: Sidero Labs description: | - This system extension provides a minimal util-linux package. + [{{ .TIER }}] This system extension provides a minimal util-linux package. compatibility: talos: version: ">= v1.0.0" diff --git a/tools/util-linux/pkg.yaml b/tools/util-linux/pkg.yaml index a47e7a1..0a66ad5 100644 --- a/tools/util-linux/pkg.yaml +++ b/tools/util-linux/pkg.yaml @@ -28,8 +28,6 @@ steps: --enable-libblkid \ --enable-nsenter \ --enable-fstrim \ - - | - sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml build: - | cd build diff --git a/tools/util-linux/vars.yaml b/tools/util-linux/vars.yaml index a9c16b3..07b7a8a 100644 --- a/tools/util-linux/vars.yaml +++ b/tools/util-linux/vars.yaml @@ -1 +1,2 @@ VERSION: "{{ .UTIL_LINUX_VERSION }}" +TIER: "contrib"