diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
index b216c74fb70..9de1eac390e 100644
--- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml
@@ -22,6 +22,10 @@ spec:
       containers:
         - image: gcr.io/google_containers/heapster:v0.15.0
           name: heapster
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200Mi
           command:
             - /heapster
             - --source=kubernetes:''
diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
index a51d3f26613..0beda9a10ff 100644
--- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
+++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
@@ -22,6 +22,10 @@ spec:
       containers:
         - image: gcr.io/google_containers/heapster:v0.15.0
           name: heapster
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200Mi
           command:
             - /heapster
             - --source=kubernetes:''
diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
index 348db83b9ac..030c34dccc3 100644
--- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
@@ -22,6 +22,10 @@ spec:
       containers:
         - image: gcr.io/google_containers/heapster:v0.15.0
           name: heapster
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200Mi
           command:
             - /heapster
             - --source=kubernetes:''
diff --git a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
index d4d40172ebe..ca2bb27cfb7 100644
--- a/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml
@@ -22,6 +22,10 @@ spec:
       containers: 
         - image: gcr.io/google_containers/heapster_influxdb:v0.3
           name: influxdb
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200Mi
           ports: 
             - containerPort: 8083
               hostPort: 8083
@@ -32,6 +36,10 @@ spec:
             mountPath: /data
         - image: gcr.io/google_containers/heapster_grafana:v0.7
           name: grafana
+          resources:
+            limits:
+              cpu: 100m
+              memory: 100Mi
           env: 
             - name: INFLUXDB_EXTERNAL_URL
               value: /api/v1/proxy/namespaces/default/services/monitoring-influxdb:api/db/
diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
index 130ee8827e2..ee765b1091c 100644
--- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
@@ -22,6 +22,10 @@ spec:
       containers:
         - image: gcr.io/google_containers/heapster:v0.15.0
           name: heapster
+          resources:
+            limits:
+              cpu: 100m
+              memory: 200Mi
           command:
             - /heapster
             - --source=kubernetes:''
diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
index 3f658f45f5b..fea4f41cc02 100644
--- a/cluster/addons/dns/skydns-rc.yaml.in
+++ b/cluster/addons/dns/skydns-rc.yaml.in
@@ -22,6 +22,10 @@ spec:
       containers:
       - name: etcd
         image: gcr.io/google_containers/etcd:2.0.9
+        resources:
+          limits:
+            cpu: 100m
+            memory: 50Mi
         command:
         - /usr/local/bin/etcd
         - -listen-client-urls
@@ -32,11 +36,19 @@ spec:
         - skydns-etcd
       - name: kube2sky
         image: gcr.io/google_containers/kube2sky:1.10
+        resources:
+          limits:
+            cpu: 100m
+            memory: 50Mi
         args:
         # command = "/kube2sky"
         - -domain={{ pillar['dns_domain'] }}
       - name: skydns
         image: gcr.io/google_containers/skydns:2015-03-11-001
+        resources:
+          limits:
+            cpu: 100m
+            memory: 50Mi
         args:
         # command = "/skydns"
         - -machines=http://localhost:4001
diff --git a/cluster/addons/fluentd-elasticsearch/es-controller.yaml b/cluster/addons/fluentd-elasticsearch/es-controller.yaml
index 2643fc7a0e6..20210f3af9b 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: db
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
index 9d8d5475158..f813fd68e3a 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"
diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
index 90f0343361d..7790e3dd546 100644
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -9,6 +9,7 @@ spec:
     resources:
       limits:
         cpu: 100m
+        memory: 200Mi
     env:
     - name: "FLUENTD_ARGS"
       value: "-qq"