Merge pull request #39175 from kubernetes/revert-39146-make-fluentd-critical

Automatic merge from submit-queue (batch tested with PRs 39059, 39175, 35676, 38655) Revert "Make fluentd pods critical" Reverts kubernetes/kubernetes#39146

Merge pull request #39175 from kubernetes/revert-39146-make-fluentd-critical
eda64e88 · Kubernetes Submit Queue · GitHub · d04fd1bd · 9d3f4d71 · eda64e88
Commit eda64e88 authored Dec 22, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 22, 2016
3 changed files
--- 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"

--- 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"

--- 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: