Skip to content

K
k3s
Commit 0b1fc056 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #27145 from piosz/heapster-res

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)]()
parents 875a60d0 89752258
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 20 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 0b1fc056
{% set base_metrics_memory = "200Mi" -%} {% set base_metrics_memory = "140Mi" -%}
{% set metrics_memory = base_metrics_memory -%} {% set metrics_memory = base_metrics_memory -%}
{% set base_eventer_memory = "200Mi" -%} {% set base_eventer_memory = "190Mi" -%}
{% set eventer_memory = base_eventer_memory -%} {% 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 -%}
...@@ -68,7 +68,7 @@ spec: ...@@ -68,7 +68,7 @@ spec:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.2
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
...@@ -96,7 +96,8 @@ spec: ...@@ -96,7 +96,8 @@ spec:
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2
- --container=heapster - --container=heapster
- --poll-period=300000 - --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 name: eventer-nanny
resources: resources:
limits: limits:
...@@ -124,6 +125,7 @@ spec: ...@@ -124,6 +125,7 @@ spec:
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential
volumes: volumes:
- name: ssl-certs - name: ssl-certs
hostPath: hostPath:
......
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ 0b1fc056
{% set base_metrics_memory = "200Mi" -%} {% set base_metrics_memory = "140Mi" -%}
{% set metrics_memory = base_metrics_memory -%} {% set metrics_memory = base_metrics_memory -%}
{% set base_eventer_memory = "200Mi" -%} {% set base_eventer_memory = "190Mi" -%}
{% set eventer_memory = base_eventer_memory -%} {% 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 -%}
...@@ -69,7 +69,7 @@ spec: ...@@ -69,7 +69,7 @@ spec:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/addon-resizer:1.0 - image: gcr.io/google_containers/addon-resizer:1.2
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
...@@ -97,7 +97,8 @@ spec: ...@@ -97,7 +97,8 @@ spec:
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2
- --container=heapster - --container=heapster
- --poll-period=300000 - --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 name: eventer-nanny
resources: resources:
limits: limits:
...@@ -125,6 +126,7 @@ spec: ...@@ -125,6 +126,7 @@ spec:
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential
volumes: volumes:
- name: ssl-certs - name: ssl-certs
hostPath: hostPath:
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 0b1fc056
{% set base_metrics_memory = "200Mi" -%} {% set base_metrics_memory = "140Mi" -%}
{% set metrics_memory = base_metrics_memory -%} {% set metrics_memory = base_metrics_memory -%}
{% set base_eventer_memory = "200Mi" -%} {% set base_eventer_memory = "190Mi" -%}
{% set eventer_memory = base_eventer_memory -%} {% 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 -%}
...@@ -60,7 +60,7 @@ spec: ...@@ -60,7 +60,7 @@ spec:
- /eventer - /eventer
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --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 name: heapster-nanny
resources: resources:
limits: limits:
...@@ -88,7 +88,8 @@ spec: ...@@ -88,7 +88,8 @@ spec:
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2
- --container=heapster - --container=heapster
- --poll-period=300000 - --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 name: eventer-nanny
resources: resources:
limits: limits:
...@@ -116,4 +117,5 @@ spec: ...@@ -116,4 +117,5 @@ spec:
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 0b1fc056
{% set base_metrics_memory = "200Mi" -%} {% set base_metrics_memory = "140Mi" -%}
{% set metrics_memory = base_metrics_memory -%} {% 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) -%}
...@@ -41,7 +41,7 @@ spec: ...@@ -41,7 +41,7 @@ spec:
command: command:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --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 name: heapster-nanny
resources: resources:
limits: limits:
...@@ -69,3 +69,4 @@ spec: ...@@ -69,3 +69,4 @@ spec:
- --deployment=heapster-v1.1.0.beta2 - --deployment=heapster-v1.1.0.beta2
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential
cluster/gce/gci/configure-helper.sh
View file @ 0b1fc056
...@@ -721,14 +721,14 @@ function start-kube-addons { ...@@ -721,14 +721,14 @@ function start-kube-addons {
local -r file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}" local -r file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}"
setup-addon-manifests "addons" "${file_dir}" setup-addon-manifests "addons" "${file_dir}"
# Replace the salt configurations with variable values. # Replace the salt configurations with variable values.
base_metrics_memory="200Mi" base_metrics_memory="140Mi"
metrics_memory="${base_metrics_memory}" metrics_memory="${base_metrics_memory}"
base_eventer_memory="200Mi" base_eventer_memory="190Mi"
eventer_memory="${base_eventer_memory}" eventer_memory="${base_eventer_memory}"
local -r metrics_memory_per_node="4" local -r metrics_memory_per_node="4"
local -r eventer_memory_per_node="500" local -r eventer_memory_per_node="500"
if [[ -n "${NUM_NODES:-}" && "${NUM_NODES}" -ge 1 ]]; then 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" metrics_memory="$((${num_kube_nodes} * ${metrics_memory_per_node} + 200))Mi"
eventer_memory="$((${num_kube_nodes} * ${eventer_memory_per_node} + 200 * 1024))Ki" eventer_memory="$((${num_kube_nodes} * ${eventer_memory_per_node} + 200 * 1024))Ki"
fi fi
......
cluster/gce/trusty/configure-helper.sh
View file @ 0b1fc056
...@@ -713,14 +713,14 @@ start_kube_addons() { ...@@ -713,14 +713,14 @@ start_kube_addons() {
file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}" file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}"
setup_addon_manifests "addons" "${file_dir}" setup_addon_manifests "addons" "${file_dir}"
# Replace the salt configurations with variable values. # Replace the salt configurations with variable values.
base_metrics_memory="200Mi" base_metrics_memory="140Mi"
metrics_memory="${base_metrics_memory}" metrics_memory="${base_metrics_memory}"
base_eventer_memory="200Mi" base_eventer_memory="190Mi"
eventer_memory="${base_eventer_memory}" eventer_memory="${base_eventer_memory}"
readonly metrics_memory_per_node="4" readonly metrics_memory_per_node="4"
readonly eventer_memory_per_node="500" readonly eventer_memory_per_node="500"
if [ -n "${NUM_NODES:-}" ] && [ "${NUM_NODES}" -ge 1 ]; then 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" metrics_memory="$((${num_kube_nodes} * ${metrics_memory_per_node} + 200))Mi"
eventer_memory="$((${num_kube_nodes} * ${eventer_memory_per_node} + 200 * 1024))Ki" eventer_memory="$((${num_kube_nodes} * ${eventer_memory_per_node} + 200 * 1024))Ki"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment