[Buildroot] [PATCH] package/containerd: add control for additional build tags

[Buildroot] [PATCH] package/containerd: add control for additional build tags

[Stefan Agner]

Disable the AUFS snapshotter by default. AUFS support has been deprecated
since v1.5 and won't be available with containerd v2.0.

Add configuration option for the ZFS snapshotter and add the proper
runtime dependencies.

Add configuration option for Kubernetes CRI support. Note that CRI
support requires a writeable /etc or an appropriate containerd
configuration.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
 package/containerd/Config.in     | 22 ++++++++++++++++++++++
 package/containerd/containerd.mk | 13 +++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/package/containerd/Config.in b/package/containerd/Config.in
index e69dd6768a..ceec5752df 100644
--- a/package/containerd/Config.in
+++ b/package/containerd/Config.in
@@ -26,6 +26,28 @@ config BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS
 	help
 	  Build the btrfs snapshot driver for containerd.
 
+config BR2_PACKAGE_CONTAINERD_DRIVER_DEVMAPPER
+	bool "devmapper snapshot driver"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
+	depends on BR2_USE_MMU # lvm2
+	depends on !BR2_STATIC_LIBS # lvm2
+	select BR2_PACKAGE_LVM2
+	help
+	  Build the devmapper snapshot driver for containerd.
+
+config BR2_PACKAGE_CONTAINERD_DRIVER_ZFS
+	bool "zfs snapshot driver"
+	depends on BR2_LINUX_KERNEL # zfs
+	depends on BR2_PACKAGE_HAS_UDEV # zfs
+	select BR2_PACKAGE_ZFS
+	help
+	  Build the zfs snapshot driver for containerd.
+
+config BR2_PACKAGE_CONTAINERD_CRI
+	bool "Build Kubernetes CRI support"
+	help
+	  Build containerd with Kubernetes CRI support.
+
 endif
 
 comment "containerd needs a glibc or musl toolchain w/ threads"
diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk
index 0591400709..f5a93f5f91 100644
--- a/package/containerd/containerd.mk
+++ b/package/containerd/containerd.mk
@@ -24,6 +24,7 @@ CONTAINERD_BUILD_TARGETS = \
 	cmd/ctr
 
 CONTAINERD_INSTALL_BINS = $(notdir $(CONTAINERD_BUILD_TARGETS))
+CONTAINERD_TAGS = no_aufs
 
 ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
 CONTAINERD_DEPENDENCIES += libapparmor
@@ -41,6 +42,18 @@ else
 CONTAINERD_TAGS += no_btrfs
 endif
 
+ifneq ($(BR2_PACKAGE_CONTAINERD_DRIVER_DEVMAPPER),y)
+CONTAINERD_TAGS += no_devmapper
+endif
+
+ifneq ($(BR2_PACKAGE_CONTAINERD_DRIVER_ZFS),y)
+CONTAINERD_TAGS += no_zfs
+endif
+
+ifneq ($(BR2_PACKAGE_CONTAINERD_CRI),y)
+CONTAINERD_TAGS += no_cri
+endif
+
 define CONTAINERD_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 0644 $(@D)/containerd.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/containerd.service
-- 
2.42.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/containerd: add control for additional build tags

[Christian Stewart via buildroot]

Hi Stefan,


On Wed, Oct 4, 2023 at 9:18 AM Stefan Agner <stefan@agner.ch> wrote:
>
> Disable the AUFS snapshotter by default. AUFS support has been deprecated
> since v1.5 and won't be available with containerd v2.0.
>
> Add configuration option for the ZFS snapshotter and add the proper
> runtime dependencies.
>
> Add configuration option for Kubernetes CRI support. Note that CRI
> support requires a writeable /etc or an appropriate containerd
> configuration.

Overall this looks good, but could you possibly split this into
separate commits? I think it makes sense to have three:

 - package/docker-engine: drop aufs snapshotter
 - package/docker-engine: add zfs snapshotter
 - package/docker-engine: add option for k8s cri support

Thanks!
Christian Stewart
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/containerd: add control for additional build tags

[Thomas Petazzoni via buildroot]

On Wed,  4 Oct 2023 18:17:36 +0200
Stefan Agner <stefan@agner.ch> wrote:

> +config BR2_PACKAGE_CONTAINERD_DRIVER_DEVMAPPER
> +	bool "devmapper snapshot driver"
> +	depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
> +	depends on BR2_USE_MMU # lvm2
> +	depends on !BR2_STATIC_LIBS # lvm2
> +	select BR2_PACKAGE_LVM2
> +	help
> +	  Build the devmapper snapshot driver for containerd.

I've added a Config.in comment here for the dependencies.

> +config BR2_PACKAGE_CONTAINERD_DRIVER_ZFS
> +	bool "zfs snapshot driver"
> +	depends on BR2_LINUX_KERNEL # zfs
> +	depends on BR2_PACKAGE_HAS_UDEV # zfs

I've propagated all "depends on" of zfs here.

> +	select BR2_PACKAGE_ZFS
> +	help
> +	  Build the zfs snapshot driver for containerd.

I've added a Config.in comment here for the dependencies.

> +
> +config BR2_PACKAGE_CONTAINERD_CRI
> +	bool "Build Kubernetes CRI support"

Dropped the "Build" word since none of the other options in this
package have this.

Applied, thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot