Skip to content

Commit 49d202b

Browse files
authored
Merge branch 'main' into multipath-tools
Signed-off-by: Jan Untersander <[email protected]>
2 parents f81f93c + 2f503ed commit 49d202b

File tree

31 files changed

+254
-78
lines changed

31 files changed

+254
-78
lines changed

.conform.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-08-01T17:25:51Z by kres faf91e3.
3+
# Generated on 2025-11-13T15:52:54Z by kres e1d6dac.
44

55
policies:
66
- type: commit
@@ -12,7 +12,7 @@ policies:
1212
gitHubOrganization: siderolabs
1313
spellcheck:
1414
locale: US
15-
maximumOfOneCommit: true
15+
maximumOfOneCommit: false
1616
header:
1717
length: 89
1818
imperative: true

.github/renovate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@
9797
"matchPackageNames": [
9898
"git://linux-nfs.org/~steved/libtirpc"
9999
]
100+
},
101+
{
102+
"versioning": "regex:^(?<major>\\d+)\\.?(?<minor>\\d+)?\\.?(?<patch>\\d+)?$",
103+
"matchPackageNames": [
104+
"systemd/systemd"
105+
]
100106
}
101107
],
102108
"separateMajorMinor": false

.kres.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ spec:
4949
- nvidia-open-gpu-kernel-modules-lts
5050
- nvidia-open-gpu-kernel-modules-production
5151
- nvme-cli
52+
- soci-snapshotter
5253
- panfrost
5354
- qemu-guest-agent
5455
- qlogic-firmware
@@ -90,11 +91,11 @@ spec:
9091
- name: EXTENSIONS_IMAGE_REF
9192
defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
9293
- name: PKGS
93-
defaultValue: v1.12.0-alpha.0-50-g4ae050a
94+
defaultValue: v1.12.0
9495
- name: PKGS_PREFIX
9596
defaultValue: ghcr.io/siderolabs
9697
- name: TOOLS
97-
defaultValue: v1.12.0-alpha.0-18-g44932c0
98+
defaultValue: v1.12.0
9899
- name: TOOLS_PREFIX
99100
defaultValue: ghcr.io/siderolabs
100101
useBldrPkgTagResolver: true
@@ -295,3 +296,6 @@ spec:
295296
- matchPackageNames:
296297
- git://linux-nfs.org/~steved/libtirpc
297298
versioning: 'regex:^(?<major>\d+)-(?<minor>\d+)-?(?<patch>\d+)?$'
299+
- matchPackageNames:
300+
- systemd/systemd
301+
versioning: 'regex:^(?<major>\d+)\.?(?<minor>\d+)?\.?(?<patch>\d+)?$'

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-11-21T09:49:36Z by kres e1d6dac.
3+
# Generated on 2025-11-15T05:31:19Z by kres e1d6dac.
44

55
# common variables
66

@@ -51,9 +51,9 @@ COMMON_ARGS += $(BUILD_ARGS)
5151
# extra variables
5252

5353
EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
54-
PKGS ?= v1.12.0-alpha.0-50-g4ae050a
54+
PKGS ?= v1.12.0
5555
PKGS_PREFIX ?= ghcr.io/siderolabs
56-
TOOLS ?= v1.12.0-alpha.0-18-g44932c0
56+
TOOLS ?= v1.12.0
5757
TOOLS_PREFIX ?= ghcr.io/siderolabs
5858
IMAGE_SIGNER_RELEASE ?= v0.1.1
5959

@@ -106,6 +106,7 @@ TARGETS += nvidia-gdrdrv-device
106106
TARGETS += nvidia-open-gpu-kernel-modules-lts
107107
TARGETS += nvidia-open-gpu-kernel-modules-production
108108
TARGETS += nvme-cli
109+
TARGETS += soci-snapshotter
109110
TARGETS += panfrost
110111
TARGETS += qemu-guest-agent
111112
TARGETS += qlogic-firmware

Pkgfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ format: v1alpha2
44

55
vars:
66
CONTAINERD_VERSION: v2.1.5 # update this when updating PKGS_VERSION in Makefile
7-
LINUX_FIRMWARE_VERSION: "20251021" # update this when updating PKGS_VERSION in Makefile
7+
LINUX_FIRMWARE_VERSION: "20251111" # update this when updating PKGS_VERSION in Makefile
88
DRBD_DRIVER_VERSION: 9.2.15 # update this when updating PKGS_VERSION in Makefile
99
ZFS_DRIVER_VERSION: 2.4.0-rc2 # update this when updating PKGS_VERSION in Makefile
1010
ZFS_TOOLS_SHA256: 6b5b821e03520034b49f965acb198ff4f37661195689326a1c05a4782389987f

README.md

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,38 +60,39 @@ tiers based on support level:
6060

6161
| Name | Tier | Image | Version | Description |
6262
| ---- | ---- | ----- | ------- | ----------- |
63-
| [crun](container-runtime/crun) | :yellow_square: extra | [ghcr.io/siderolabs/crun](https://github.com/siderolabs/extensions/pkgs/container/crun) | `1.24` | This system extension provides crun using containerd's runtime handler. |
63+
| [crun](container-runtime/crun) | :yellow_square: extra | [ghcr.io/siderolabs/crun](https://github.com/siderolabs/extensions/pkgs/container/crun) | `1.25` | This system extension provides crun using containerd's runtime handler. |
6464
| [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.34.1` | This system extension provides a binary which implements Kubelet's CredentialProvider API to authenticate against AWS' Elastic Container Registry and pull images. |
65-
| [gvisor](container-runtime/gvisor) | :green_square: core | [ghcr.io/siderolabs/gvisor](https://github.com/siderolabs/extensions/pkgs/container/gvisor) | `20251020.0` | This system extension provides gVisor using containerd's runtime handler. |
65+
| [gvisor](container-runtime/gvisor) | :green_square: core | [ghcr.io/siderolabs/gvisor](https://github.com/siderolabs/extensions/pkgs/container/gvisor) | `20251103.0` | This system extension provides gVisor using containerd's runtime handler. |
6666
| [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. |
6767
| [kata-containers](container-runtime/kata-containers) | :yellow_square: extra | [ghcr.io/siderolabs/kata-containers](https://github.com/siderolabs/extensions/pkgs/container/kata-containers) | `3.22.0` | This system extension provides kata-container using containerd's runtime handler. |
68+
| [soci-snapshotter](container-runtime/soci-snapshotter) | :yellow_square: extra | [ghcr.io/siderolabs/soci-snapshotter](https://github.com/siderolabs/extensions/pkgs/container/soci-snapshotter) | `v0.11.1` | This system extension provides AWS SOCI Snapshotter using containerd's runtime handler. |
6869
| [spin](container-runtime/spin) | :yellow_square: extra | [ghcr.io/siderolabs/spin](https://github.com/siderolabs/extensions/pkgs/container/spin) | `v0.22.0` | This system extension provides support for spin runtime (WebAssembly) containers. |
69-
| [stargz-snapshotter](container-runtime/stargz-snapshotter) | :green_square: core | [ghcr.io/siderolabs/stargz-snapshotter](https://github.com/siderolabs/extensions/pkgs/container/stargz-snapshotter) | `v0.18.0` | This system extension provides Stargz Snapshotter using containerd's runtime handler. |
70+
| [stargz-snapshotter](container-runtime/stargz-snapshotter) | :green_square: core | [ghcr.io/siderolabs/stargz-snapshotter](https://github.com/siderolabs/extensions/pkgs/container/stargz-snapshotter) | `v0.18.1` | This system extension provides Stargz Snapshotter using containerd's runtime handler. |
7071
| [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. |
71-
| [youki](container-runtime/youki) | :white_large_square: contrib | [ghcr.io/siderolabs/youki](https://github.com/siderolabs/extensions/pkgs/container/youki) | `0.5.6` | This system extension provides youki using containerd's runtime handler. |
72+
| [youki](container-runtime/youki) | :white_large_square: contrib | [ghcr.io/siderolabs/youki](https://github.com/siderolabs/extensions/pkgs/container/youki) | `0.5.7` | This system extension provides youki using containerd's runtime handler. |
7273

7374
### Firmware
7475

7576
| Name | Tier | Image | Version | Description |
7677
| ---- | ---- | ----- | ------- | ----------- |
77-
| [amd-ucode](firmware/amd-ucode) | :green_square: core | [ghcr.io/siderolabs/amd-ucode](https://github.com/siderolabs/extensions/pkgs/container/amd-ucode) | `20251021` | This system extension provides AMD microcode binaries. |
78-
| [bnx2-bnx2x](firmware/bnx2-bnx2x) | :green_square: core | [ghcr.io/siderolabs/bnx2-bnx2x](https://github.com/siderolabs/extensions/pkgs/container/bnx2-bnx2x) | `20251021` | This system extension provides bnx2 and bnx2x binaries. |
79-
| [chelsio-firmware](firmware/chelsio) | :white_large_square: contrib | [ghcr.io/siderolabs/chelsio-firmware](https://github.com/siderolabs/extensions/pkgs/container/chelsio-firmware) | `20251021` | This system extension provides Chelsio NIC firmware binaries. |
80-
| [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) | `20251021` | This system extension provides Intel Ice firmware binaries. |
81-
| [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. |
82-
| [qlogic-firmware](firmware/qlogic-firmware) | :green_square: core | [ghcr.io/siderolabs/qlogic-firmware](https://github.com/siderolabs/extensions/pkgs/container/qlogic-firmware) | `20251021` | This system extension provides firmware for QLogic devices. |
83-
| [realtek-firmware](firmware/realtek-firmware) | :green_square: core | [ghcr.io/siderolabs/realtek-firmware](https://github.com/siderolabs/extensions/pkgs/container/realtek-firmware) | `20251021` | This system extension provides realtek firmware binaries. |
78+
| [amd-ucode](firmware/amd-ucode) | :green_square: core | [ghcr.io/siderolabs/amd-ucode](https://github.com/siderolabs/extensions/pkgs/container/amd-ucode) | `20251111` | This system extension provides AMD microcode binaries. |
79+
| [bnx2-bnx2x](firmware/bnx2-bnx2x) | :green_square: core | [ghcr.io/siderolabs/bnx2-bnx2x](https://github.com/siderolabs/extensions/pkgs/container/bnx2-bnx2x) | `20251111` | This system extension provides bnx2 and bnx2x binaries. |
80+
| [chelsio-firmware](firmware/chelsio) | :white_large_square: contrib | [ghcr.io/siderolabs/chelsio-firmware](https://github.com/siderolabs/extensions/pkgs/container/chelsio-firmware) | `20251111` | This system extension provides Chelsio NIC firmware binaries. |
81+
| [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) | `20251111` | This system extension provides Intel Ice firmware binaries. |
82+
| [intel-ucode](firmware/intel-ucode) | :green_square: core | [ghcr.io/siderolabs/intel-ucode](https://github.com/siderolabs/extensions/pkgs/container/intel-ucode) | `20251111` | This system extension provides Intel microcode binaries. |
83+
| [qlogic-firmware](firmware/qlogic-firmware) | :green_square: core | [ghcr.io/siderolabs/qlogic-firmware](https://github.com/siderolabs/extensions/pkgs/container/qlogic-firmware) | `20251111` | This system extension provides firmware for QLogic devices. |
84+
| [realtek-firmware](firmware/realtek-firmware) | :green_square: core | [ghcr.io/siderolabs/realtek-firmware](https://github.com/siderolabs/extensions/pkgs/container/realtek-firmware) | `20251111` | This system extension provides realtek firmware binaries. |
8485
| [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. |
8586

8687
### Direct Rendering Manager (DRM)
8788

8889
| Name | Tier | Image | Version | Description |
8990
| ---- | ---- | ----- | ------- | ----------- |
90-
| [amdgpu](drm/amdgpu) | :green_square: core | [ghcr.io/siderolabs/amdgpu](https://github.com/siderolabs/extensions/pkgs/container/amdgpu) | `20251021-VERSION` | This system extension provides AMDGPU firmware binaries and kernel modules. |
91-
| [i915](drm/i915) | :green_square: core | [ghcr.io/siderolabs/i915](https://github.com/siderolabs/extensions/pkgs/container/i915) | `20251021-VERSION` | This system extension provides Intel GPU microcode binaries and kernel modules. |
92-
| [panfrost](drm/panfrost) | :white_large_square: contrib | [ghcr.io/siderolabs/panfrost](https://github.com/siderolabs/extensions/pkgs/container/panfrost) | `20251021-VERSION` | This system extension provides ARM Mali Midgard, Bifrost, and Valhall firmware binaries and kernel modules. |
91+
| [amdgpu](drm/amdgpu) | :green_square: core | [ghcr.io/siderolabs/amdgpu](https://github.com/siderolabs/extensions/pkgs/container/amdgpu) | `20251111-VERSION` | This system extension provides AMDGPU firmware binaries and kernel modules. |
92+
| [i915](drm/i915) | :green_square: core | [ghcr.io/siderolabs/i915](https://github.com/siderolabs/extensions/pkgs/container/i915) | `20251111-VERSION` | This system extension provides Intel GPU microcode binaries and kernel modules. |
93+
| [panfrost](drm/panfrost) | :white_large_square: contrib | [ghcr.io/siderolabs/panfrost](https://github.com/siderolabs/extensions/pkgs/container/panfrost) | `20251111-VERSION` | This system extension provides ARM Mali Midgard, Bifrost, and Valhall firmware binaries and kernel modules. |
9394
| [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. |
94-
| [xe](drm/xe) | :green_square: core | [ghcr.io/siderolabs/xe](https://github.com/siderolabs/extensions/pkgs/container/xe) | `20251021-VERSION` | This system extension provides Intel GPU microcode binaries and kernel modules. |
95+
| [xe](drm/xe) | :green_square: core | [ghcr.io/siderolabs/xe](https://github.com/siderolabs/extensions/pkgs/container/xe) | `20251111-VERSION` | This system extension provides Intel GPU microcode binaries and kernel modules. |
9596

9697
### Drivers
9798

@@ -128,10 +129,10 @@ tiers based on support level:
128129

129130
| Name | Tier | Image | Version | Description |
130131
| ---- | ---- | ----- | ------- | ----------- |
131-
| [cloudflared](network/cloudflared) | :white_large_square: contrib | [ghcr.io/siderolabs/cloudflared](https://github.com/siderolabs/extensions/pkgs/container/cloudflared) | `2025.10.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/ |
132+
| [cloudflared](network/cloudflared) | :white_large_square: contrib | [ghcr.io/siderolabs/cloudflared](https://github.com/siderolabs/extensions/pkgs/container/cloudflared) | `2025.11.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/ |
132133
| [lldpd](network/lldpd) | :yellow_square: extra | [ghcr.io/siderolabs/lldpd](https://github.com/siderolabs/extensions/pkgs/container/lldpd) | `1.0.20` | LLDP adds a LLDP discovery service to Talos. LLDP cli can be used to interface with the daemon. |
133134
| [nebula](network/nebula) | :white_large_square: contrib | [ghcr.io/siderolabs/nebula](https://github.com/siderolabs/extensions/pkgs/container/nebula) | `1.9.7` | A scalable overlay networking tool with a focus on performance, simplicity and security |
134-
| [netbird](network/netbird) | :white_large_square: contrib | [ghcr.io/siderolabs/netbird](https://github.com/siderolabs/extensions/pkgs/container/netbird) | `0.59.11` | NetBird combines a WireGuard®-based overlay network with Zero Trust Network Access, providing a unified open source platform for reliable and secure connectivity. |
135+
| [netbird](network/netbird) | :white_large_square: contrib | [ghcr.io/siderolabs/netbird](https://github.com/siderolabs/extensions/pkgs/container/netbird) | `0.59.12` | NetBird combines a WireGuard®-based overlay network with Zero Trust Network Access, providing a unified open source platform for reliable and secure connectivity. |
135136
| [newt](network/newt) | :white_large_square: contrib | [ghcr.io/siderolabs/newt](https://github.com/siderolabs/extensions/pkgs/container/newt) | `1.6.0` | 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 |
136137
| [tailscale](network/tailscale) | :yellow_square: extra | [ghcr.io/siderolabs/tailscale](https://github.com/siderolabs/extensions/pkgs/container/tailscale) | `1.90.6` | Tailscale connects your team's devices and development environments for easy access to remote resources. |
137138
| [zerotier](network/zerotier) | :white_large_square: contrib | [ghcr.io/siderolabs/zerotier](https://github.com/siderolabs/extensions/pkgs/container/zerotier) | `1.16.0` | Connect your Talos cluster into a zerotier network |
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[proxy_plugins]
2+
[proxy_plugins.soci]
3+
type = "snapshot"
4+
address = "/var/run/soci-snapshotter/soci-snapshotter-grpc.sock"
5+
6+
[plugins."io.containerd.cri.v1.images"]
7+
snapshotter = "soci"
8+
disable_snapshot_annotations = false
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# AWS SOCI Snapshotter extension
2+
3+
## Installation
4+
5+
See [Installing Extensions](https://github.com/siderolabs/extensions#installing-extensions).
6+
7+
## Pulling from Privte Registries
8+
9+
To pull from private registries an additional step is required. You must configure the Kubelet to use the SOCI snapshotter as an image service proxy. This is explained in more detail in the [SOCI docs](https://github.com/awslabs/soci-snapshotter/blob/main/docs/registry-authentication.md#kubernetes-cri-credentials). An example config patch:
10+
11+
```yaml
12+
machine:
13+
kubelet:
14+
extraConfig:
15+
imageServiceEndpoint: unix:///var/run/soci-snapshotter/soci-snapshotter-grpc.sock
16+
```
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# SOCI Snapshotter configuration
2+
3+
# Enable use of the SOCI snapshotter as a proxy ImageService so it can pull
4+
# images from private registries.
5+
[cri_keychain]
6+
enable_keychain = true
7+
image_service_path = "/var/run/containerd/containerd.sock"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: v1alpha1
2+
metadata:
3+
name: soci-snapshotter
4+
version: "{{ .VERSION }}"
5+
author: Sidero Labs
6+
description: |
7+
[{{ .TIER }}] This system extension provides AWS SOCI Snapshotter using containerd's runtime handler.
8+
compatibility:
9+
talos:
10+
version: ">= v1.8.0"

0 commit comments

Comments
 (0)