Merge pull request #46675 from gyliu513/calico

Automatic merge from submit-queue (batch tested with PRs 46456, 46675, 46676, 46416, 46375)

Move tolerations to PodSpec for calico-node.yaml.

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
none
```

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"