Merge pull request #618 from andrewrynhard/tolerate_dedicated_master

Tolerate flannel running on master nodes

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