From 7afd21085b4fff16111afe166304339d12670869 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 29 Oct 2024 20:18:24 +0000
Subject: 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>
---
 .../containerd/containerd/cni-containerd-net.conf  | 24 ----------------------
 .../containerd/cni-containerd-net.conflist         | 24 ++++++++++++++++++++++
 .../packagegroups/packagegroup-container.bb        |  3 +++
 3 files changed, 27 insertions(+), 24 deletions(-)
 delete mode 100644 recipes-containers/containerd/containerd/cni-containerd-net.conf
 create mode 100644 recipes-containers/containerd/containerd/cni-containerd-net.conflist

diff --git a/recipes-containers/containerd/containerd/cni-containerd-net.conf b/recipes-containers/containerd/containerd/cni-containerd-net.conf
deleted file mode 100644
index ca434d6f..00000000
--- a/recipes-containers/containerd/containerd/cni-containerd-net.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "cniVersion": "0.4.0",
-  "name": "containerd-net",
-  "plugins": [
-    {
-      "type": "bridge",
-      "bridge": "cni0",
-      "isGateway": true,
-      "ipMasq": true,
-      "promiscMode": true,
-      "ipam": {
-        "type": "host-local",
-        "subnet": "10.88.0.0/16",
-        "routes": [
-          { "dst": "0.0.0.0/0" }
-        ]
-      }
-    },
-    {
-      "type": "portmap",
-      "capabilities": {"portMappings": true}
-    }
-  ]
-}
diff --git a/recipes-containers/containerd/containerd/cni-containerd-net.conflist b/recipes-containers/containerd/containerd/cni-containerd-net.conflist
new file mode 100644
index 00000000..ca434d6f
--- /dev/null
+++ b/recipes-containers/containerd/containerd/cni-containerd-net.conflist
@@ -0,0 +1,24 @@
+{
+  "cniVersion": "0.4.0",
+  "name": "containerd-net",
+  "plugins": [
+    {
+      "type": "bridge",
+      "bridge": "cni0",
+      "isGateway": true,
+      "ipMasq": true,
+      "promiscMode": true,
+      "ipam": {
+        "type": "host-local",
+        "subnet": "10.88.0.0/16",
+        "routes": [
+          { "dst": "0.0.0.0/0" }
+        ]
+      }
+    },
+    {
+      "type": "portmap",
+      "capabilities": {"portMappings": true}
+    }
+  ]
+}
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 \
 "
 
-- 
cgit v1.2.3-54-g00ecf