From d659c16eb48471b5871d928fd9de75626ba5e78a Mon Sep 17 00:00:00 2001
From: Christoph Held <christoph.held@est.fujitsu.com>
Date: Fri, 8 Jul 2016 11:17:40 +0200
Subject: [PATCH] add default flannel configuration for cni

---
 cluster/images/hyperkube/Dockerfile                    | 3 +++
 cluster/images/hyperkube/cni-conf/10-containernet.conf | 9 +++++++++
 cluster/images/hyperkube/cni-conf/99-loopback.conf     | 3 +++
 3 files changed, 15 insertions(+)
 create mode 100644 cluster/images/hyperkube/cni-conf/10-containernet.conf
 create mode 100644 cluster/images/hyperkube/cni-conf/99-loopback.conf

diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile
index ed47f7d37de..9f5d54c3fb2 100644
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -68,6 +68,9 @@ ADD https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz /
 # Copy the cni folder into /opt/
 COPY cni /opt/cni
 
+# Copy overlay configuration to default directory
+COPY cni-conf /etc/cni/net.d
+
 # Create symlinks for each hyperkube server
 # TODO: this is unreliable for now (e.g. running "/kubelet" panics)
 # Also, it doesn't work for other architectures
diff --git a/cluster/images/hyperkube/cni-conf/10-containernet.conf b/cluster/images/hyperkube/cni-conf/10-containernet.conf
new file mode 100644
index 00000000000..8bac40b4e8f
--- /dev/null
+++ b/cluster/images/hyperkube/cni-conf/10-containernet.conf
@@ -0,0 +1,9 @@
+{
+  "name": "containernet",
+  "type": "flannel",
+  "delegate": {
+        "bridge": "cni0",
+        "mtu": 1450,
+        "isDefaultGateway": true
+    }
+}
diff --git a/cluster/images/hyperkube/cni-conf/99-loopback.conf b/cluster/images/hyperkube/cni-conf/99-loopback.conf
new file mode 100644
index 00000000000..ccdb618f7ef
--- /dev/null
+++ b/cluster/images/hyperkube/cni-conf/99-loopback.conf
@@ -0,0 +1,3 @@
+{
+    "type": "loopback"
+}