Skip to content

Commit

Permalink
Merge pull request #26109 from Q-Lee/addon-resizer
Browse files Browse the repository at this point in the history 
Fixing heapster memory requirements.
  • Loading branch information
@wojtek-t
wojtek-t committed May 24, 2016
2 parents a68fc24 + 81ee3e2 commit 307767e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 14 deletions.
10 changes: 6 additions & 4 deletions cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% set metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%}
{% set base_metrics_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 eventer_memory_per_node = 500 -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%}
Expand Down Expand Up @@ -88,7 +90,7 @@ spec:
- /pod_nanny
- --cpu=100m
- --extra-cpu=0m
- --memory={{ metrics_memory }}
- --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
Expand Down Expand Up @@ -116,7 +118,7 @@ spec:
- /pod_nanny
- --cpu=100m
- --extra-cpu=0m
- --memory={{eventer_memory}}
- --memory={{base_eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
Expand Down
10 changes: 6 additions & 4 deletions cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% set metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%}
{% set base_metrics_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 eventer_memory_per_node = 500 -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%}
Expand Down Expand Up @@ -89,7 +91,7 @@ spec:
- /pod_nanny
- --cpu=100m
- --extra-cpu=0m
- --memory={{ metrics_memory }}
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
Expand Down Expand Up @@ -117,7 +119,7 @@ spec:
- /pod_nanny
- --cpu=100m
- --extra-cpu=0m
- --memory={{ eventer_memory }}
- --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
Expand Down
10 changes: 6 additions & 4 deletions cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% set metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%}
{% set base_metrics_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 eventer_memory_per_node = 500 -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%}
Expand Down Expand Up @@ -80,7 +82,7 @@ spec:
- /pod_nanny
- --cpu=100m
- --extra-cpu=0m
- --memory={{ metrics_memory }}
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
Expand Down Expand Up @@ -108,7 +110,7 @@ spec:
- /pod_nanny
- --cpu=100m
- --extra-cpu=0m
- --memory={{ eventer_memory }}
- --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
Expand Down
5 changes: 3 additions & 2 deletions cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file
Original file line number Diff line number Diff line change
@@ -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 num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%}
Expand Down Expand Up @@ -62,7 +63,7 @@ spec:
- /pod_nanny
- --cpu=100m
- --extra-cpu=0m
- --memory={{ metrics_memory }}
- --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.1.0.beta2
Expand Down

0 comments on commit 307767e

Please sign in to comment.