mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #21258 from gmarek/heapster
Auto commit by PR queue bot
This commit is contained in:
commit
85018f728e
@ -1,7 +1,7 @@
|
||||
{% set heapster_memory = "300Mi" -%}
|
||||
{% set heapster_memory = "200Mi" -%}
|
||||
{% set num_nodes = pillar.get('num_nodes', -1) -%}
|
||||
{% if num_nodes >= 0 -%}
|
||||
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
|
||||
{% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
|
||||
{% endif -%}
|
||||
|
||||
apiVersion: v1
|
||||
|
@ -1,7 +1,7 @@
|
||||
{% set heapster_memory = "300Mi" -%}
|
||||
{% set heapster_memory = "200Mi" -%}
|
||||
{% set num_nodes = pillar.get('num_nodes', -1) -%}
|
||||
{% if num_nodes >= 0 -%}
|
||||
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
|
||||
{% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
|
||||
{% endif -%}
|
||||
|
||||
apiVersion: v1
|
||||
|
@ -1,7 +1,7 @@
|
||||
{% set heapster_memory = "300Mi" -%}
|
||||
{% set heapster_memory = "200Mi" -%}
|
||||
{% set num_nodes = pillar.get('num_nodes', -1) -%}
|
||||
{% if num_nodes >= 0 -%}
|
||||
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
|
||||
{% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
|
||||
{% endif -%}
|
||||
|
||||
apiVersion: v1
|
||||
|
@ -1,7 +1,7 @@
|
||||
{% set heapster_memory = "300Mi" -%}
|
||||
{% set heapster_memory = "200Mi" -%}
|
||||
{% set num_nodes = pillar.get('num_nodes', -1) -%}
|
||||
{% if num_nodes >= 0 -%}
|
||||
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
|
||||
{% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
|
||||
{% endif -%}
|
||||
|
||||
apiVersion: v1
|
||||
|
@ -628,9 +628,9 @@ prepare_kube_addons() {
|
||||
file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}"
|
||||
setup_addon_manifests "addons" "${file_dir}"
|
||||
# Replace the salt configurations with variable values.
|
||||
heapster_memory="300Mi"
|
||||
heapster_memory="200Mi"
|
||||
if [ -n "${NUM_NODES:-}" ] && [ "${NUM_NODES}" -gt 1 ]; then
|
||||
heapster_memory="$((${NUM_NODES} * 12 + 200))Mi"
|
||||
heapster_memory="$((${NUM_NODES} * 3 + 200))Mi"
|
||||
fi
|
||||
controller_yaml="${addon_dst_dir}/${file_dir}"
|
||||
if [ "${ENABLE_CLUSTER_MONITORING:-}" = "googleinfluxdb" ]; then
|
||||
|
Loading…
Reference in New Issue
Block a user