Merge pull request #41489 from Crassirostris/fluentd-add-toleration

Automatic merge from submit-queue (batch tested with PRs 40000, 41508, 41489) Add toleration to fluentd daemonset to make it run on master Because of https://github.com/kubernetes/kubernetes/pull/41172 fluentd pods stopped being allocated on master node. This PR introduces toleration for master taint for fluentd. CC @davidopp @janetkuo @kubernetes/sig-scheduling-bugs Unfortunately, we don't have e2e tests to ensure that master logs are being ingested. This problem is a great signal to work on https://github.com/kubernetes/kubernetes/issues/41411

Merge pull request #41489 from Crassirostris/fluentd-add-toleration
627c6ce2 · Kubernetes Submit Queue · GitHub · 5ff9a72e · cbba60cc · 627c6ce2
Commit 627c6ce2 authored Feb 16, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

fluentd-es-ds.yaml cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +4 -3

fluentd-gcp-ds.yaml cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +1 -0

No files found.
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
@@ -14,11 +14,12 @@ spec:
        k8s-app: fluentd-es
        kubernetes.io/cluster-service: "true"
        version: v1.22
-  # This annotation ensures that fluentd does not get evicted if the node
-  # supports critical pod annotation based priority scheme.
-  # Note that this does not guarantee admission on the nodes (#40573).
+      # This annotation ensures that fluentd does not get evicted if the node
+      # supports critical pod annotation based priority scheme.
+      # Note that this does not guarantee admission on the nodes (#40573).
      annotations:
        scheduler.alpha.kubernetes.io/critical-pod: ''
+        scheduler.alpha.kubernetes.io/tolerations: '[{"key": "node.alpha.kubernetes.io/ismaster", "effect": "NoSchedule"}]'
    spec:
      containers:
      - name: fluentd-es

--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -20,6 +20,7 @@ spec:
      # Note that this does not guarantee admission on the nodes (#40573).
      annotations:
        scheduler.alpha.kubernetes.io/critical-pod: ''
+        scheduler.alpha.kubernetes.io/tolerations: '[{"key": "node.alpha.kubernetes.io/ismaster", "effect": "NoSchedule"}]'
    spec:
      dnsPolicy: Default
      containers: