github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27187 from gmarek/heapster-nanny

Browse Source 
Automatic merge from submit-queue

Adjust memory limit for heapster's pod nanny

cc @piosz @wojtek-t @zmerlynn
This commit is contained in:
k8s-merge-robot
2016-06-14 04:56:46 -07:00
committed by GitHub
parent 970104df31 0986efc089
commit 1aece22176
6 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@@ -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: