github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27145 from piosz/heapster-res

Browse Source 
Automatic merge from submit-queue

Use exponential estimator for Heapster addon resizer

cc @fgrzadkowski @mwielgus @roberthbailey 
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
This commit is contained in:
k8s-merge-robot 2016-06-13 03:40:14 -07:00 committed by GitHub
commit 0b1fc056ac
6 changed files with 27 additions and 20 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,6 +1,6 @@
{% set base_metrics_memory = "200Mi" -%}
{% set base_metrics_memory = "140Mi" -%}
{% set metrics_memory = base_metrics_memory -%}
{% set base_eventer_memory = "200Mi" -%}
{% set base_eventer_memory = "190Mi" -%}
{% set eventer_memory = base_eventer_memory -%}
{% set metrics_memory_per_node = 4 -%}
{% set eventer_memory_per_node = 500 -%}
@ -68,7 +68,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/addon-resizer:1.0
- image: gcr.io/google_containers/addon-resizer:1.2
name: heapster-nanny
resources:
limits:
@ -96,7 +96,8 @@ spec:
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
- --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.2
name: eventer-nanny
resources:
limits:
@ -124,6 +125,7 @@ spec:
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000
- --estimator=exponential
volumes:
- name: ssl-certs
hostPath:

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

@ -1,6 +1,6 @@
{% set base_metrics_memory = "200Mi" -%}
{% set base_metrics_memory = "140Mi" -%}
{% set metrics_memory = base_metrics_memory -%}
{% set base_eventer_memory = "200Mi" -%}
{% set base_eventer_memory = "190Mi" -%}
{% set eventer_memory = base_eventer_memory -%}
{% set metrics_memory_per_node = 4 -%}
{% set eventer_memory_per_node = 500 -%}
@ -69,7 +69,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/addon-resizer:1.0
- image: gcr.io/google_containers/addon-resizer:1.2
name: heapster-nanny
resources:
limits:
@ -97,7 +97,8 @@ spec:
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
- --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.2
name: eventer-nanny
resources:
limits:
@ -125,6 +126,7 @@ spec:
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000
- --estimator=exponential
volumes:
- name: ssl-certs
hostPath:

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

@ -1,6 +1,6 @@
{% set base_metrics_memory = "200Mi" -%}
{% set base_metrics_memory = "140Mi" -%}
{% set metrics_memory = base_metrics_memory -%}
{% set base_eventer_memory = "200Mi" -%}
{% set base_eventer_memory = "190Mi" -%}
{% set eventer_memory = base_eventer_memory -%}
{% set metrics_memory_per_node = 4 -%}
{% set eventer_memory_per_node = 500 -%}
@ -60,7 +60,7 @@ spec:
- /eventer
- --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086
- image: gcr.io/google_containers/addon-resizer:1.0
- image: gcr.io/google_containers/addon-resizer:1.2
name: heapster-nanny
resources:
limits:
@ -88,7 +88,8 @@ spec:
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:1.0
- --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.2
name: eventer-nanny
resources:
limits:
@ -116,4 +117,5 @@ spec:
- --deployment=heapster-v1.1.0.beta2
- --container=eventer
- --poll-period=300000
- --estimator=exponential

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

@ -1,4 +1,4 @@
{% set base_metrics_memory = "200Mi" -%}
{% set base_metrics_memory = "140Mi" -%}
{% set metrics_memory = base_metrics_memory -%}
{% set metrics_memory_per_node = 4 -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%}
@ -41,7 +41,7 @@ spec:
command:
- /heapster
- --source=kubernetes.summary_api:''
- image: gcr.io/google_containers/addon-resizer:1.0
- image: gcr.io/google_containers/addon-resizer:1.2
name: heapster-nanny
resources:
limits:
@ -69,3 +69,4 @@ spec:
- --deployment=heapster-v1.1.0.beta2
- --container=heapster
- --poll-period=300000
- --estimator=exponential

6
cluster/gce/gci/configure-helper.sh
View File

@ -721,14 +721,14 @@ function start-kube-addons {
local -r file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}"
setup-addon-manifests "addons" "${file_dir}"
# Replace the salt configurations with variable values.
base_metrics_memory="200Mi"
base_metrics_memory="140Mi"
metrics_memory="${base_metrics_memory}"
base_eventer_memory="200Mi"
base_eventer_memory="190Mi"
eventer_memory="${base_eventer_memory}"
local -r metrics_memory_per_node="4"
local -r eventer_memory_per_node="500"
if [[ -n "${NUM_NODES:-}" && "${NUM_NODES}" -ge 1 ]]; then
num_kube_nodes="$((${NUM_NODES}-1))"
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"
fi

6
cluster/gce/trusty/configure-helper.sh
View File

@ -713,14 +713,14 @@ start_kube_addons() {
file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}"
setup_addon_manifests "addons" "${file_dir}"
# Replace the salt configurations with variable values.
base_metrics_memory="200Mi"
base_metrics_memory="140Mi"
metrics_memory="${base_metrics_memory}"
base_eventer_memory="200Mi"
base_eventer_memory="190Mi"
eventer_memory="${base_eventer_memory}"
readonly metrics_memory_per_node="4"
readonly eventer_memory_per_node="500"
if [ -n "${NUM_NODES:-}" ] && [ "${NUM_NODES}" -ge 1 ]; then
num_kube_nodes="$((${NUM_NODES}-1))"
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"
fi