Merge pull request #27187 from gmarek/heapster-nanny

Automatic merge from submit-queue

Adjust memory limit for heapster's pod nanny

cc @piosz @wojtek-t @zmerlynn

cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml

@@ -2,8 +2,11 @@
 {% set metrics_memory = base_metrics_memory -%}
 {% set metrics_memory_per_node = 4 -%}
 {% set num_nodes = pillar.get('num_nodes', -1) -%}
+{% set nanny_memory = "90Mi" -%}
+{% set nanny_memory_per_node = 200 -%}
 {% if num_nodes >= 0 -%}
   {% set metrics_memory = (200 + num_nodes * metrics_memory_per_node)|string + "Mi" -%}
+  {% set nanny_memory = (90 * 1024 + num_nodes * nanny_memory_per_node)|string + "Ki" -%}
 {% endif -%}
 
 apiVersion: extensions/v1beta1
@@ -46,10 +49,10 @@ spec:
           resources:
             limits:
               cpu: 50m
-              memory: 100Mi
+              memory: {{ nanny_memory }}
             requests:
               cpu: 50m
-              memory: 100Mi
+              memory: {{ nanny_memory }}
           env:
             - name: MY_POD_NAME
               valueFrom: