upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-05-19 08:32:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check that num_nodes is both defined and not None, not just defined

Browse source
This commit is contained in:
Brendan Burns 2016-01-12 07:20:35 -08:00
parent 5b43a12775
commit 9c843495d7
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file

@ -1,5 +1,5 @@
{% set heapster_memory = "300Mi" -%}
{% if pillar['num_nodes'] is defined -%}
{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%}
{% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
{% endif -%}

2
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file

@ -1,5 +1,5 @@
{% set heapster_memory = "300Mi" -%}
{% if pillar['num_nodes'] is defined -%}
{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%}
{% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
{% endif -%}

2
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file

@ -1,5 +1,5 @@
{% set heapster_memory = "300Mi" -%}
{% if pillar['num_nodes'] is defined -%}
{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%}
{% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
{% endif -%}

2
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file

@ -1,5 +1,5 @@
{% set heapster_memory = "300Mi" -%}
{% if pillar['num_nodes'] is defined -%}
{% if pillar['num_nodes'] is defined and pillar['num_nodes'] is not None -%}
{% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
{% endif -%}