Merge pull request #19963 from freehan/monitor

fix heapster rc file jinja syntax error
This commit is contained in:
Brendan Burns 2016-01-21 21:03:50 -08:00
commit faf10632fe
4 changed files with 12 additions and 8 deletions

View File

@ -1,6 +1,7 @@
{% set heapster_memory = "300Mi" -%} {% set heapster_memory = "300Mi" -%}
{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%} {% set num_nodes = pillar.get('num_nodes', -1) %}
{% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%} {% if num_nodes >= 0 %}
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
{% endif -%} {% endif -%}
apiVersion: v1 apiVersion: v1

View File

@ -1,6 +1,7 @@
{% set heapster_memory = "300Mi" -%} {% set heapster_memory = "300Mi" -%}
{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%} {% set num_nodes = pillar.get('num_nodes', -1) %}
{% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%} {% if num_nodes >= 0 %}
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
{% endif -%} {% endif -%}
apiVersion: v1 apiVersion: v1

View File

@ -1,6 +1,7 @@
{% set heapster_memory = "300Mi" -%} {% set heapster_memory = "300Mi" -%}
{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%} {% set num_nodes = pillar.get('num_nodes', -1) %}
{% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%} {% if num_nodes >= 0 %}
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
{% endif -%} {% endif -%}
apiVersion: v1 apiVersion: v1

View File

@ -1,6 +1,7 @@
{% set heapster_memory = "300Mi" -%} {% set heapster_memory = "300Mi" -%}
{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%} {% set num_nodes = pillar.get('num_nodes', -1) %}
{% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%} {% if num_nodes >= 0 %}
{% set heapster_memory = (200 + num_nodes * 12)|string + "Mi" -%}
{% endif -%} {% endif -%}
apiVersion: v1 apiVersion: v1