diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index 41545089e5e..fb842aa0766 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -5,9 +5,12 @@ {% set metrics_memory_per_node = 4 -%} {% set eventer_memory_per_node = 500 -%} {% 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 eventer_memory = (200 * 1024 + num_nodes * eventer_memory_per_node)|string + "Ki" -%} + {% set nanny_memory = (90 * 1024 + num_nodes * nanny_memory_per_node)|string + "Ki" -%} {% endif -%} apiVersion: extensions/v1beta1 @@ -73,10 +76,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: @@ -102,10 +105,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: diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index b30abc42b34..11f66f268c8 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -5,9 +5,12 @@ {% set metrics_memory_per_node = 4 -%} {% set eventer_memory_per_node = 500 -%} {% 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 eventer_memory = (200 * 1024 + num_nodes * eventer_memory_per_node)|string + "Ki" -%} + {% set nanny_memory = (90 * 1024 + num_nodes * nanny_memory_per_node)|string + "Ki" -%} {% endif -%} apiVersion: extensions/v1beta1 @@ -74,10 +77,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: @@ -103,10 +106,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: diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index 9e810707a5b..eaee0c1b6fa 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -5,9 +5,12 @@ {% set metrics_memory_per_node = 4 -%} {% set eventer_memory_per_node = 500 -%} {% 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 eventer_memory = (200 * 1024 + num_nodes * eventer_memory_per_node)|string + "Ki" -%} + {% set nanny_memory = (90 * 1024 + num_nodes * nanny_memory_per_node)|string + "Ki" -%} {% endif -%} apiVersion: extensions/v1beta1 @@ -65,10 +68,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: @@ -94,10 +97,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: diff --git a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml b/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml index a1f74e1d654..134a692350d 100644 --- a/cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml +++ b/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: diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index c676b6dba06..71999c0c81a 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -726,12 +726,15 @@ function start-kube-addons { metrics_memory="${base_metrics_memory}" base_eventer_memory="190Mi" eventer_memory="${base_eventer_memory}" + nanny_memory="90Mi" local -r metrics_memory_per_node="4" local -r eventer_memory_per_node="500" + local -r nanny_memory_per_node="200" if [[ -n "${NUM_NODES:-}" && "${NUM_NODES}" -ge 1 ]]; then num_kube_nodes="$((${NUM_NODES}+1))" metrics_memory="$((${num_kube_nodes} * ${metrics_memory_per_node} + 200))Mi" eventer_memory="$((${num_kube_nodes} * ${eventer_memory_per_node} + 200 * 1024))Ki" + nanny_memory="$((${num_kube_nodes} * ${nanny_memory_per_node} + 90 * 1024))Ki" fi controller_yaml="${dst_dir}/${file_dir}" if [[ "${ENABLE_CLUSTER_MONITORING:-}" == "googleinfluxdb" ]]; then @@ -746,6 +749,7 @@ function start-kube-addons { sed -i -e "s@{{ *eventer_memory *}}@${eventer_memory}@g" "${controller_yaml}" sed -i -e "s@{{ *metrics_memory_per_node *}}@${metrics_memory_per_node}@g" "${controller_yaml}" sed -i -e "s@{{ *eventer_memory_per_node *}}@${eventer_memory_per_node}@g" "${controller_yaml}" + sed -i -e "s@{{ *nanny_memory *}}@${nanny_memory}@g" "${controller_yaml}" fi if [[ "${ENABLE_CLUSTER_DNS:-}" == "true" ]]; then setup-addon-manifests "addons" "dns" diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index 60bfa74a0f7..cb112382442 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -718,12 +718,15 @@ start_kube_addons() { metrics_memory="${base_metrics_memory}" base_eventer_memory="190Mi" eventer_memory="${base_eventer_memory}" + nanny_memory="90Mi" readonly metrics_memory_per_node="4" readonly eventer_memory_per_node="500" + readonly nanny_memory_per_node="200" if [ -n "${NUM_NODES:-}" ] && [ "${NUM_NODES}" -ge 1 ]; then num_kube_nodes="$((${NUM_NODES}+1))" metrics_memory="$((${num_kube_nodes} * ${metrics_memory_per_node} + 200))Mi" eventer_memory="$((${num_kube_nodes} * ${eventer_memory_per_node} + 200 * 1024))Ki" + nanny_memory="$((${num_kube_nodes} * ${nanny_memory_per_node} + 90 * 1024))Ki" fi controller_yaml="${addon_dst_dir}/${file_dir}" if [ "${ENABLE_CLUSTER_MONITORING:-}" = "googleinfluxdb" ]; then @@ -738,6 +741,7 @@ start_kube_addons() { sed -i -e "s@{{ *eventer_memory *}}@${eventer_memory}@g" "${controller_yaml}" sed -i -e "s@{{ *metrics_memory_per_node *}}@${metrics_memory_per_node}@g" "${controller_yaml}" sed -i -e "s@{{ *eventer_memory_per_node *}}@${eventer_memory_per_node}@g" "${controller_yaml}" + sed -i -e "s@{{ *nanny_memory *}}@${nanny_memory}@g" "${controller_yaml}" fi if [ "${ENABLE_L7_LOADBALANCING:-}" = "glbc" ]; then setup_addon_manifests "addons" "cluster-loadbalancing/glbc"