From 2bf38e0ec427866f423a2a399cca02bf07140ee8 Mon Sep 17 00:00:00 2001
From: Guangya Liu <gyliu513@gmail.com>
Date: Wed, 31 May 2017 11:32:21 +0800
Subject: [PATCH] Move tolerations to PodSpec for calico-node.yaml.

---
 cluster/addons/calico-policy-controller/calico-node.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cluster/addons/calico-policy-controller/calico-node.yaml b/cluster/addons/calico-policy-controller/calico-node.yaml
index 94ce5ea4e1..9244711d18 100644
--- a/cluster/addons/calico-policy-controller/calico-node.yaml
+++ b/cluster/addons/calico-policy-controller/calico-node.yaml
@@ -17,9 +17,6 @@ spec:
         k8s-app: calico-node
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
-        scheduler.alpha.kubernetes.io/tolerations: |
-          [{"key": "dedicated", "value": "master", "effect": "NoSchedule" },
-           {"key":"CriticalAddonsOnly", "operator":"Exists"}]
     spec:
       nodeSelector:
         projectcalico.org/ds-ready: "true"
@@ -134,3 +131,6 @@ spec:
         - name: cni-net-dir
           hostPath:
             path: /etc/cni/net.d
+      tolerations:
+      - key: "CriticalAddonsOnly"
+        operator: "Exists"