Merge pull request #8657 from dchen1107/podstatus

Initial cpu limit for fluentd pods (file based).
2015-05-22 08:59:41 -07:00 · 2015-05-22 08:59:41 -07:00 · 8db8c35daa
parent 64c4e264f2 626d25d50e
commit 8db8c35daa
2 changed files with 6 additions and 0 deletions
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@ -6,6 +6,9 @@ spec:
  containers:
  - name: fluentd-elasticsearch
    image: gcr.io/google_containers/fluentd-elasticsearch:1.5
+    resources:
+      limits:
+        cpu: 100m
    env:
    - name: "FLUENTD_ARGS"
      value: "-qq"
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@ -6,6 +6,9 @@ spec:
  containers:
  - name: fluentd-cloud-logging
    image: gcr.io/google_containers/fluentd-gcp:1.6
+    resources:
+      limits:
+        cpu: 100m
    env:
    - name: "FLUENTD_ARGS"
      value: "-qq"