Merge pull request #43441 from crassirostris/bump-fluentd-gcp-memory-limit

Automatic merge from submit-queue Increase memory limit for fluentd-gcp This PR increases fluentd memory limit in fluentd-gcp addon to avoid OOMs. Request is left intact

Merge pull request #43441 from crassirostris/bump-fluentd-gcp-memory-limit
3d3062c1 · Kubernetes Submit Queue · GitHub · 0a6d82d8 · 48e750f5 · 3d3062c1
Commit 3d3062c1 authored Mar 21, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

fluentd-gcp-ds.yaml cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +1 -1

fluentd-gcp.yaml cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +1 -1

No files found.
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -41,7 +41,7 @@ spec:
          value: --no-supervisor
        resources:
          limits:
-            memory: 200Mi
+            memory: 300Mi
          requests:
            cpu: 100m
            memory: 200Mi

--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -419,7 +419,7 @@ spec:
        </match>
    resources:
      limits:
-        memory: 200Mi
+        memory: 300Mi
      requests:
        # Any change here should be accompanied by a proportional change in CPU
        # requests of other per-node add-ons (e.g. kube-proxy).