mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 05:27:21 +00:00
Merge pull request #27145 from piosz/heapster-res
Automatic merge from submit-queue Use exponential estimator for Heapster addon resizer cc @fgrzadkowski @mwielgus @roberthbailey []()
This commit is contained in:
commit
0b1fc056ac
@ -1,6 +1,6 @@
|
|||||||
{% 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:
|
|||||||
- 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:
|
|||||||
- --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:
|
|||||||
- --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:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{% 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:
|
|||||||
- 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:
|
|||||||
- --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:
|
|||||||
- --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:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{% 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:
|
|||||||
- /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:
|
|||||||
- --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:
|
|||||||
- --deployment=heapster-v1.1.0.beta2
|
- --deployment=heapster-v1.1.0.beta2
|
||||||
- --container=eventer
|
- --container=eventer
|
||||||
- --poll-period=300000
|
- --poll-period=300000
|
||||||
|
- --estimator=exponential
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{% 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:
|
|||||||
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:
|
|||||||
- --deployment=heapster-v1.1.0.beta2
|
- --deployment=heapster-v1.1.0.beta2
|
||||||
- --container=heapster
|
- --container=heapster
|
||||||
- --poll-period=300000
|
- --poll-period=300000
|
||||||
|
- --estimator=exponential
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user