Adding upstream version 4.9.3+ds1.upstream/4.9.3+ds1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 57 insertions, 0 deletions

diff --git a/cni/87-podman-bridge.conflist b/cni/87-podman-bridge.conflist
new file mode 100644
index 0000000..ef760a6
--- /dev/null
+++ b/cni/87-podman-bridge.conflist
@@ -0,0 +1,37 @@
+{
+  "cniVersion": "0.4.0",
+  "name": "podman",
+  "plugins": [
+    {
+      "type": "bridge",
+      "bridge": "cni-podman0",
+      "isGateway": true,
+      "ipMasq": true,
+      "hairpinMode": true,
+      "ipam": {
+        "type": "host-local",
+        "routes": [{ "dst": "0.0.0.0/0" }],
+        "ranges": [
+          [
+            {
+              "subnet": "10.88.0.0/16",
+              "gateway": "10.88.0.1"
+            }
+          ]
+        ]
+      }
+    },
+    {
+      "type": "portmap",
+      "capabilities": {
+        "portMappings": true
+      }
+    },
+    {
+      "type": "firewall"
+    },
+    {
+      "type": "tuning"
+    }
+  ]
+}
diff --git a/cni/README.md b/cni/README.md
new file mode 100644
index 0000000..7b8ea09
--- /dev/null
+++ b/cni/README.md
@@ -0,0 +1,20 @@
+## `cni` ##
+
+**Note**: The CNI backend is deprecated and will be removed in the next major Podman version 5.0, in preference
+of Netavark, see **[podman-network(1)](../docs/source/markdown/podman-network.1.md)** on how to change the backend.
+
+There are a wide variety of different [CNI](https://github.com/containernetworking/cni) network configurations. This
+directory just contains an example configuration that can be used as the
+basis for your own configuration.
+
+To use this configuration, place it in `/etc/cni/net.d` (or the directory
+specified by `cni_config_dir` in your `containers.conf`).
+
+For example a basic network configuration can be achieved with:
+
+```bash
+sudo mkdir -p /etc/cni/net.d
+curl -qsSL https://raw.githubusercontent.com/containers/podman/main/cni/87-podman-bridge.conflist | sudo tee /etc/cni/net.d/87-podman-bridge.conflist
+```
+
+Dependent upon your CNI configuration, you will need to install as a minimum the `port` and `bridge`  [CNI plugins](https://github.com/containernetworking/plugins) into `/opt/cni/bin` (or the directory specified by `cni_plugin_dir` in containers.conf).  Please refer to the [CNI](https://github.com/containernetworking) project page in GitHub for more information.