Merge pull request #47906 from gmarek/fluentd

Automatic merge from submit-queue Decrese fluentd cpu request Fix #47905 cc @piosz - this should fix your tests. cc @dchen1107
2017-06-22 12:27:14 -07:00
parent d73a75b4b1 8427d5a274
commit 045a6dca07
2 changed files with 2 additions and 2 deletions
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
@@ -32,7 +32,7 @@ spec:
          limits:
            memory: 200Mi
          requests:
-            cpu: 100m
+            cpu: 90m
            memory: 200Mi
        volumeMounts:
        - name: varlog
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -44,7 +44,7 @@ spec:
          limits:
            memory: 300Mi
          requests:
-            cpu: 100m
+            cpu: 90m
            memory: 200Mi
        volumeMounts:
        - name: varlog