From 4e729c6c7ce1d88e8ad8e23732bd1ee6d3f23ccb Mon Sep 17 00:00:00 2001
From: Alex Robinson <arob@google.com>
Date: Tue, 1 Mar 2016 19:22:41 -0800
Subject: [PATCH] Reconfigure fluentd's resource limits and requests.

-Remove CPU limits to enable CPU bursting once 1.2 begins enforcing CPU limits.
-Add a memory limit for fluentd-es to match fluentd-gcp.
-Explicitly set requests to match limits.
---
 cluster/saltbase/salt/fluentd-es/fluentd-es.yaml   | 3 +++
 cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
index 1341aa9bcd3..24c1c170c35 100644
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -11,7 +11,10 @@ spec:
     image: gcr.io/google_containers/fluentd-elasticsearch:1.14
     resources:
       limits:
+        memory: 200Mi
+      requests:
         cpu: 100m
+        memory: 200Mi
     volumeMounts:
     - name: varlog
       mountPath: /var/log
diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
index c8f48a9ca0a..25b0ac0c4c9 100644
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -12,6 +12,8 @@ spec:
     image: gcr.io/google_containers/fluentd-gcp:1.16
     resources:
       limits:
+        memory: 200Mi
+      requests:
         cpu: 100m
         memory: 200Mi
     env: