Set resource limit for both elasticsearch and kibana containers based…

… on data collected by #10335
kubernetes · Jul 1, 2015 · 6b61918 · 6b61918
1 parent ce520dd
commit 6b61918
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
@@ -22,6 +22,9 @@ spec:
       containers:
       - image: gcr.io/google_containers/elasticsearch:1.4
         name: elasticsearch-logging         
+        resources:
+          limits:
+            cpu: 100m
         ports:
         - containerPort: 9200
           name: es-port

diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -22,6 +22,9 @@ spec:
       containers:
       - name: kibana-logging
         image: gcr.io/google_containers/kibana:1.3
+        resources:
+          limits:
+            cpu: 100m
         env:
           - name: "ELASTICSEARCH_URL"
             value: "http://elasticsearch-logging:9200"