diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
index 9ef3adc93c8a..f2f4bedf5cdf 100644
--- 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
index 677bc5f664a6..f28060b3bdbf 100644
--- 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"