Merge pull request #39146 from Crassirostris/make-fluentd-critical

Automatic merge from submit-queue Make fluentd pods critical Related to https://github.com/kubernetes/kubernetes/issues/38322 Make fluentd critical so it will be evicted with less probability. CC @piosz @fgrzadkowski

Merge pull request #39146 from Crassirostris/make-fluentd-critical
0e9cb8f8 · Kubernetes Submit Queue · GitHub · a30b6e2d · 4a7b3d75 · 0e9cb8f8
Commit 0e9cb8f8 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,6 +10,8 @@ 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,6 +11,8 @@ 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,6 +4,8 @@ kind: Pod
 metadata:
  name: fluentd-cloud-logging
  namespace: kube-system
+  annotations:
+    scheduler.alpha.kubernetes.io/critical-pod: ''
  labels:
    k8s-app: fluentd-logging
 spec: