summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-10-29 20:18:24 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2024-11-15 19:50:00 +0000
commit7afd21085b4fff16111afe166304339d12670869 (patch)
treecdaa191ea5f7fe79bfbd9ae9cd37b91d6eacb536
parenteb5c2bc4a5b48adf11a8fb3ae5cf63e65bde2f4a (diff)
downloadmeta-virtualization-7afd21085b4fff16111afe166304339d12670869.tar.gz
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 <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/containerd/containerd/cni-containerd-net.conflist (renamed from recipes-containers/containerd/containerd/cni-containerd-net.conf)0
-rw-r--r--recipes-core/packagegroups/packagegroup-container.bb3
2 files changed, 3 insertions, 0 deletions
diff --git a/recipes-containers/containerd/containerd/cni-containerd-net.conf b/recipes-containers/containerd/containerd/cni-containerd-net.conflist
index ca434d6f..ca434d6f 100644
--- a/recipes-containers/containerd/containerd/cni-containerd-net.conf
+++ b/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 = " \
41 41
42RDEPENDS:packagegroup-cni = " \ 42RDEPENDS:packagegroup-cni = " \
43 cni \ 43 cni \
44 iptables \
44 iproute2 \ 45 iproute2 \
46 ipset \
45 bridge-utils \ 47 bridge-utils \
46" 48"
47 49
@@ -70,5 +72,6 @@ RDEPENDS:packagegroup-containerd = " \
70 packagegroup-cni \ 72 packagegroup-cni \
71 containerd-cni \ 73 containerd-cni \
72 nerdctl \ 74 nerdctl \
75 tini \
73" 76"
74 77