Initial checkin from CRI-O repo

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

3 files changed, 35 insertions, 0 deletions

diff --git a/contrib/cni/10-crio-bridge.conf b/contrib/cni/10-crio-bridge.conf
new file mode 100644
index 000000000..27f0ddfec
--- /dev/null
+++ b/contrib/cni/10-crio-bridge.conf
@@ -0,0 +1,15 @@
+{
+    "cniVersion": "0.2.0",
+    "name": "crio-bridge",
+    "type": "bridge",
+    "bridge": "cni0",
+    "isGateway": true,
+    "ipMasq": true,
+    "ipam": {
+        "type": "host-local",
+        "subnet": "10.88.0.0/16",
+        "routes": [
+            { "dst": "0.0.0.0/0" }
+        ]
+    }
+}
diff --git a/contrib/cni/99-loopback.conf b/contrib/cni/99-loopback.conf
new file mode 100644
index 000000000..dd6630a85
--- /dev/null
+++ b/contrib/cni/99-loopback.conf
@@ -0,0 +1,4 @@
+{
+    "cniVersion": "0.2.0",
+    "type": "loopback"
+}
diff --git a/contrib/cni/README.md b/contrib/cni/README.md
new file mode 100644
index 000000000..78e22fd36
--- /dev/null
+++ b/contrib/cni/README.md
@@ -0,0 +1,16 @@
+## `contrib/cni` ##
+
+There are a wide variety of different [CNI][cni] network configurations. This
+directory just contains some example configurations that can be used as the
+basis for your own configurations (distributions should package these files in
+example directories).
+
+To use these configurations, place them in `/etc/cni/net.d` (or the directory
+specified by `crio.network.network_dir` in your `crio.conf`).
+
+In addition, you need to install the [CNI plugins][cni] necessary into
+`/opt/cni/bin` (or the directory specified by `crio.network.plugin_dir`). The
+two plugins necessary for the example CNI configurations are `loopback` and
+`bridge`.
+
+[cni]: https://github.com/containernetworking/plugins