Skip to content

K
k3s
Commit 85018f72 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #21258 from gmarek/heapster

Auto commit by PR queue bot
parents 3868bb43 9c722ba9
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 85018f72
{% set heapster_memory = "300Mi" -%} {% set heapster_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%} {% if num_nodes >= 0 -%}
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%} {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
{% endif -%} {% endif -%}
apiVersion: v1 apiVersion: v1
......
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ 85018f72
{% set heapster_memory = "300Mi" -%} {% set heapster_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%} {% if num_nodes >= 0 -%}
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%} {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
{% endif -%} {% endif -%}
apiVersion: v1 apiVersion: v1
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 85018f72
{% set heapster_memory = "300Mi" -%} {% set heapster_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%} {% if num_nodes >= 0 -%}
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%} {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
{% endif -%} {% endif -%}
apiVersion: v1 apiVersion: v1
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 85018f72
{% set heapster_memory = "300Mi" -%} {% set heapster_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%} {% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%} {% if num_nodes >= 0 -%}
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%} {% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
{% endif -%} {% endif -%}
apiVersion: v1 apiVersion: v1
......
cluster/gce/trusty/configure.sh
View file @ 85018f72
...@@ -628,9 +628,9 @@ prepare_kube_addons() { ...@@ -628,9 +628,9 @@ prepare_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.
heapster_memory="300Mi" heapster_memory="200Mi"
if [ -n "${NUM_NODES:-}" ] && [ "${NUM_NODES}" -gt 1 ]; then if [ -n "${NUM_NODES:-}" ] && [ "${NUM_NODES}" -gt 1 ]; then
heapster_memory="$((${NUM_NODES} * 12 + 200))Mi" heapster_memory="$((${NUM_NODES} * 3 + 200))Mi"
fi fi
controller_yaml="${addon_dst_dir}/${file_dir}" controller_yaml="${addon_dst_dir}/${file_dir}"
if [ "${ENABLE_CLUSTER_MONITORING:-}" = "googleinfluxdb" ]; then if [ "${ENABLE_CLUSTER_MONITORING:-}" = "googleinfluxdb" ]; then
......
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