From 29ad5046671c10bee38959fd56bd57aab159b8e5 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 4 Oct 2023 18:19:27 +0200 Subject: [PATCH] Remove unnecessary plug-ins from containerd (#2789) * Bump buildroot * buildroot a1bdf74b19...f125c3e292 (1): > package/containerd: add control for additional build tags * Drop unnecessary containerd changes Now that the snappshotter and the CRI plug-ins are disabled we don't need to configure or disable them via configuration anymore. Drop the unnecessary configs. --- buildroot | 2 +- .../rootfs-overlay/etc/containerd/config.toml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/buildroot b/buildroot index a1bdf74b1..f125c3e29 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit a1bdf74b194d4a7af407b40213dcec85b5789737 +Subproject commit f125c3e292ba76802975e50f37e7e1127ecca903 diff --git a/buildroot-external/rootfs-overlay/etc/containerd/config.toml b/buildroot-external/rootfs-overlay/etc/containerd/config.toml index f6f449cd4..b672a447a 100644 --- a/buildroot-external/rootfs-overlay/etc/containerd/config.toml +++ b/buildroot-external/rootfs-overlay/etc/containerd/config.toml @@ -1,15 +1,6 @@ version = 2 disabled_plugins = [ - "io.containerd.snapshotter.v1.aufs", - "io.containerd.snapshotter.v1.devmapper", - "io.containerd.snapshotter.v1.zfs", "io.containerd.internal.v1.opt", "io.containerd.tracing.processor.v1.otlp", "io.containerd.internal.v1.tracing" ] - -[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] -cni_conf_dir = "/run/cni/net.d" - -[plugins."io.containerd.grpc.v1.cri".cni] -conf_dir = "/run/cni/net.d"