Merge pull request #46676 from gyliu513/masq

Automatic merge from submit-queue (batch tested with PRs 46456, 46675, 46676, 46416, 46375) Move tolerations to PodSpec for ip-masq-agent.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 ```

Merge pull request #46676 from gyliu513/masq
2ff0fb7e · Kubernetes Submit Queue · GitHub · 83259438 · fde69b1f · 2ff0fb7e
Commit 2ff0fb7e authored Jun 03, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ip-masq-agent.yaml cluster/addons/ip-masq-agent/ip-masq-agent.yaml +3 -3

No files found.
--- a/cluster/addons/ip-masq-agent/ip-masq-agent.yaml
+++ b/cluster/addons/ip-masq-agent/ip-masq-agent.yaml
@@ -13,9 +13,6 @@ spec:
        k8s-app: ip-masq-agent
      annotations:
        scheduler.alpha.kubernetes.io/critical-pod: ''
-        scheduler.alpha.kubernetes.io/tolerations: |
-          [{"key": "dedicated", "value": "master", "effect": "NoSchedule" },
-          {"key":"CriticalAddonsOnly", "operator":"Exists"}]
    spec:
      hostNetwork: true
      containers:
@@ -36,3 +33,6 @@ spec:
              # The daemon looks for its config in a YAML file at /etc/config/ip-masq-agent
              - key: config
                path: ip-masq-agent
+      tolerations:
+      - key: "CriticalAddonsOnly"
+        operator: "Exists"