From 9d3f4d71524e179c58ee4bd0797c731a1fcf2da3 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Thu, 22 Dec 2016 15:58:36 -0800 Subject: [PATCH] Revert "Make fluentd pods critical" --- cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 2 -- cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml | 2 -- cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml | 2 -- 3 files changed, 6 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index e789a51f65c..7daad4f2b35 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -10,8 +10,6 @@ metadata: spec: template: metadata: - annotations: - scheduler.alpha.kubernetes.io/critical-pod: '' labels: k8s-app: fluentd-es kubernetes.io/cluster-service: "true" diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml index 5c3e08d49d7..1844037ad8b 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml @@ -11,8 +11,6 @@ metadata: spec: template: metadata: - annotations: - scheduler.alpha.kubernetes.io/critical-pod: '' labels: k8s-app: fluentd-gcp kubernetes.io/cluster-service: "true" diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml index 231d2e3b1af..db0ff46cc81 100644 --- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml @@ -4,8 +4,6 @@ kind: Pod metadata: name: fluentd-cloud-logging namespace: kube-system - annotations: - scheduler.alpha.kubernetes.io/critical-pod: '' labels: k8s-app: fluentd-logging spec: