Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add ctr extension #647

Merged
merged 1 commit into from
Mar 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ spec:
- chelsio-firmware
- cloudflared
- crun
- ctr
- drbd
- dvb-cx23885
- ecr-credential-provider
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2025-03-24T15:08:32Z by kres d903dae.
# Generated on 2025-03-26T20:28:56Z by kres d903dae.

# common variables

Expand Down Expand Up @@ -66,6 +66,7 @@ TARGETS += chelsio-drivers
TARGETS += chelsio-firmware
TARGETS += cloudflared
TARGETS += crun
TARGETS += ctr
TARGETS += drbd
TARGETS += dvb-cx23885
TARGETS += ecr-credential-provider
Expand Down
1 change: 1 addition & 0 deletions Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
format: v1alpha2

vars:
CONTAINERD_VERSION: v2.0.4 # update this when updating PKGS_VERSION in Makefile
LINUX_FIRMWARE_VERSION: "20250311" # update this when updating PKGS_VERSION in Makefile
DRBD_DRIVER_VERSION: 9.2.12 # update this when updating PKGS_VERSION in Makefile
ZFS_DRIVER_VERSION: 2.3.1 # update this when updating PKGS_VERSION in Makefile
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ cosign verify --certificate-identity-regexp '@siderolabs\.com$' --certificate-oi
| ------------------------------------- | ----------------------------------------- | ------------------ |
| [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` |

## Building Extensions

Expand Down
6 changes: 6 additions & 0 deletions hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ Open-iSCSI: 2.1.11
title = "NFS Server"
description = """\
The NFS server (nfds) as a kernel module is now supported as a system extension.
"""

[notes.ctr]
title = "ctr"
description = """\
The containerd CLI (ctr) is now supported as a system extension.
"""

[make_deps]
9 changes: 9 additions & 0 deletions tools/ctr/manifest.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: v1alpha1
metadata:
name: ctr
version: "$VERSION"
author: Tomasz Jonak
description: "This extension provides ctr containerd helper binary"
compatibility:
talos:
version: ">= v1.0.0"
24 changes: 24 additions & 0 deletions tools/ctr/pkg.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: ctr
variant: scratch
shell: /bin/bash
dependencies:
- stage: base
- image: "{{ .BUILD_ARG_PKGS_PREFIX }}/containerd:{{ .BUILD_ARG_PKGS }}"
steps:
- prepare:
- sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml
install:
- |
mkdir -p /rootfs/usr/local/bin
cp /usr/bin/ctr /rootfs/usr/local/bin
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: /
1 change: 1 addition & 0 deletions tools/ctr/vars.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VERSION: "{{ .CONTAINERD_VERSION }}"