From 114029f509076744f6860d77c0085419be7e088d Mon Sep 17 00:00:00 2001
From: Brent Newson <brent.newson@clearpoint.co.nz>
Date: Thu, 21 Sep 2017 10:10:31 +1200
Subject: [PATCH] removed the key for tolerations in flannel daemonset so that
 it will still be scheduled on a node that has a custom taint on it

---
 roles/network_plugin/flannel/templates/cni-flannel.yml.j2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
index 165395c24..986e11ae8 100644
--- a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
+++ b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
@@ -103,7 +103,6 @@ spec:
           mountPath: /host/opt/cni/bin/
       hostNetwork: true
       tolerations:
-      - key: node-role.kubernetes.io/master
         operator: Exists
         effect: NoSchedule
       volumes: