From 7afd21085b4fff16111afe166304339d12670869 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 29 Oct 2024 20:18:24 +0000 Subject: [PATCH] packagegroups: add iproute, iptables and tini As it turns out CNI needs iptables to configure some plugins, and without it we get a silent fail. It will also be added to the recipe as a RRECOMMENDS, but we also put it in the packagegroup for more visibility. Signed-off-by: Bruce Ashfield --- .../{cni-containerd-net.conf => cni-containerd-net.conflist} | 0 recipes-core/packagegroups/packagegroup-container.bb | 3 +++ 2 files changed, 3 insertions(+) rename recipes-containers/containerd/containerd/{cni-containerd-net.conf => cni-containerd-net.conflist} (100%) diff --git a/recipes-containers/containerd/containerd/cni-containerd-net.conf b/recipes-containers/containerd/containerd/cni-containerd-net.conflist similarity index 100% rename from recipes-containers/containerd/containerd/cni-containerd-net.conf rename to recipes-containers/containerd/containerd/cni-containerd-net.conflist diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb index a2bc7327..aba1d3e1 100644 --- a/recipes-core/packagegroups/packagegroup-container.bb +++ b/recipes-core/packagegroups/packagegroup-container.bb @@ -41,7 +41,9 @@ RDEPENDS:packagegroup-podman = " \ RDEPENDS:packagegroup-cni = " \ cni \ + iptables \ iproute2 \ + ipset \ bridge-utils \ " @@ -70,5 +72,6 @@ RDEPENDS:packagegroup-containerd = " \ packagegroup-cni \ containerd-cni \ nerdctl \ + tini \ "