add default flannel configuration for cni

lavalamp · Jul 8, 2016 · d659c16 · d659c16
1 parent dbab1a8
commit d659c16
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,3 @@
+{
+    "type": "loopback"
+}