From 0986efc0896c544c9f512e21e7416defbd87923d Mon Sep 17 00:00:00 2001 From: gmarek Date: Fri, 10 Jun 2016 17:04:03 +0200 Subject: [PATCH] Increase memory limit for heapster's pod nanny --- .../google/heapster-controller.yaml | 11 +++++++---- .../googleinfluxdb/heapster-controller-combined.yaml | 11 +++++++---- .../influxdb/heapster-controller.yaml | 11 +++++++---- .../standalone/heapster-controller.yaml | 7 +++++-- cluster/gce/gci/configure-helper.sh | 4 ++++ cluster/gce/trusty/configure-helper.sh | 4 ++++ 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index fa8210b110b..7a54fbcac75 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: @@ -101,10 +104,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 0bfbf587ae0..26f35f493ef 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: @@ -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/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index 98c5604297c..675af165571 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: @@ -93,10 +96,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 2a625363e1b..41f875c87c4 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 e0de8194b72..1ac6dfda635 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -725,12 +725,15 @@ function start-kube-addons { metrics_memory="${base_metrics_memory}" base_eventer_memory="200Mi" 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 @@ -745,6 +748,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 ea2905dada0..5f81b1096d9 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -717,12 +717,15 @@ start_kube_addons() { metrics_memory="${base_metrics_memory}" base_eventer_memory="200Mi" 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 @@ -737,6 +740,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"