From 9310b0dad7be2d35f78a89ca84f860e7b8f7c384 Mon Sep 17 00:00:00 2001
From: Andrew Rynhard <andrew@andrewrynhard.com>
Date: Wed, 22 Feb 2017 11:02:53 -0800
Subject: [PATCH] Tolerate flannel running on master nodes

---
 Documentation/kube-flannel.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml
index 5795a72e22..e668798dd3 100644
--- a/Documentation/kube-flannel.yml
+++ b/Documentation/kube-flannel.yml
@@ -45,6 +45,9 @@ spec:
       hostNetwork: true
       nodeSelector:
         beta.kubernetes.io/arch: amd64
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        effect: NoSchedule
       serviceAccountName: flannel
       containers:
       - name: kube-flannel