Merge pull request #3318 from BradErz/fixes-#3317

Automatic merge from submit-queue

Fixes #3317 allowing to spawn flannel on all nodes in the cluster

upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml

@@ -96,8 +96,7 @@ spec:
         beta.kubernetes.io/arch: amd64
       serviceAccountName: flannel
       tolerations:
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
+      - operator: Exists
       containers:
       - name: kube-flannel
         image: quay.io/coreos/flannel:v0.7.1