From cbba60cc7d54253680d60bfae2593898a785c36f Mon Sep 17 00:00:00 2001 From: Mik Vyatskov Date: Wed, 15 Feb 2017 18:11:45 +0100 Subject: [PATCH] Add toleration to fluentd daemonset to make it run on master --- cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 7 ++++--- cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index 07fb013efa0..a844acc2e83 100644 --- 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 diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml index 844a547cb1d..199b1b6a660 100644 --- 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: containers: - name: fluentd-gcp