github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #26109 from Q-Lee/addon-resizer 

Fixing heapster memory requirements.
pull/6/head
Wojciech Tyczynski 2016-05-24 08:17:49 +02:00
parent a68fc248d3 81ee3e2d30
commit 307767ec7c
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
{% set metrics_memory = "200Mi" -%} {% set base_metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%} {% set metrics_memory = base_metrics_memory -%}
{% set base_eventer_memory = "200Mi" -%}
{% set eventer_memory = base_eventer_memory -%}
{% set metrics_memory_per_node = 4 -%} {% set metrics_memory_per_node = 4 -%}
{% set eventer_memory_per_node = 500 -%} {% set eventer_memory_per_node = 500 -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
@ -88,7 +90,7 @@ spec:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=100m
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{ metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2
@ -116,7 +118,7 @@ spec:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=100m
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{eventer_memory}} - --memory={{base_eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki - --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2

10
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@ -1,5 +1,7 @@
{% set metrics_memory = "200Mi" -%} {% set base_metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%} {% set metrics_memory = base_metrics_memory -%}
{% set base_eventer_memory = "200Mi" -%}
{% set eventer_memory = base_eventer_memory -%}
{% set metrics_memory_per_node = 4 -%} {% set metrics_memory_per_node = 4 -%}
{% set eventer_memory_per_node = 500 -%} {% set eventer_memory_per_node = 500 -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
@ -89,7 +91,7 @@ spec:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=100m
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{ metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2
@ -117,7 +119,7 @@ spec:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=100m
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{ eventer_memory }} - --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2

10
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@ -1,5 +1,7 @@
{% set metrics_memory = "200Mi" -%} {% set base_metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%} {% set metrics_memory = base_metrics_memory -%}
{% set base_eventer_memory = "200Mi" -%}
{% set eventer_memory = base_eventer_memory -%}
{% set metrics_memory_per_node = 4 -%} {% set metrics_memory_per_node = 4 -%}
{% set eventer_memory_per_node = 500 -%} {% set eventer_memory_per_node = 500 -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
@ -80,7 +82,7 @@ spec:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=100m
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{ metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2
@ -108,7 +110,7 @@ spec:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=100m
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{ eventer_memory }} - --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2

5
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@ -1,4 +1,5 @@
{% set metrics_memory = "200Mi" -%} {% set base_metrics_memory = "200Mi" -%}
{% set metrics_memory = base_metrics_memory -%}
{% set metrics_memory_per_node = 4 -%} {% set metrics_memory_per_node = 4 -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%} {% if num_nodes >= 0 -%}
@ -62,7 +63,7 @@ spec:
- /pod_nanny - /pod_nanny
- --cpu=100m - --cpu=100m
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{ metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5 - --threshold=5
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2