github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19535 from brendandburns/salt

Browse Source 
Check that num_nodes is both defined and not None, not just defined
This commit is contained in:
Alex Mohr
2016-01-21 10:42:53 -08:00
parent a77f7205ea 9c843495d7
commit 4c8e28b77c
4 changed files with 4 additions and 4 deletions
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" -%} {% 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" -%} {% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
{% endif -%} {% endif -%}

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

@@ -1,5 +1,5 @@
{% set heapster_memory = "300Mi" -%} {% 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" -%} {% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
{% endif -%} {% endif -%}

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

@@ -1,5 +1,5 @@
{% set heapster_memory = "300Mi" -%} {% 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" -%} {% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
{% endif -%} {% endif -%}

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

@@ -1,5 +1,5 @@
{% set heapster_memory = "300Mi" -%} {% 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" -%} {% set heapster_memory = (200 + pillar['num_nodes'] * 12)|string + "Mi" -%}
{% endif -%} {% endif -%}