Merge pull request #3097 from igorcanadi/calico_tolerations

Automatic merge from submit-queue

added wider toleration to calico-node daemonset (#2857)

Calico pod needs to run on all nodes, regardless of their taints. Otherwise the node cannot join the cluster. See #2857 for more discussion. This commit was originally ca16@b66b626 by @ca16. It's also similar to the PR that kube-aws recently merged: https://github.com/kubernetes-incubator/kube-aws/pull/687/files.

Would you mind merging this to 1.7 branch too?

upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template

@@ -118,10 +118,12 @@ spec:
       hostNetwork: true
       serviceAccountName: calico
       tolerations:
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
       - key: CriticalAddonsOnly
         operator: Exists
+      - effect: NoExecute
+        operator: Exists
+      - effect: NoSchedule
+        operator: Exists
       containers:
         # Runs calico/node container on each Kubernetes node.  This
         # container programs network policy and routes on each