Merge pull request #7876 from cjcullen/cbr0

Fix controller-manager manifest for providers that don't specify CLUSTER_IP_RANGE

Merge pull request #7876 from cjcullen/cbr0
0b5a18fc · Maxwell Forbes · f6b70294 · f0c26052 · 0b5a18fc
Commit 0b5a18fc authored May 06, 2015 by Maxwell Forbes
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

kube-controller-manager.manifest .../kube-controller-manager/kube-controller-manager.manifest +1 -1

No files found.
--- a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
+++ b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
@@ -11,7 +11,7 @@
 {% if pillar['instance_prefix'] is defined -%}
  {% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%}
 {% endif -%}
-{% if pillar['cluster_cidr'] is defined -%}
+{% if pillar['cluster_cidr'] is defined and pillar['cluster_cidr'] != "" -%}
  {% set cluster_cidr = "--cluster-cidr=" + pillar['cluster_cidr'] -%}
 {% endif -%}
 {% if pillar['allocate_node_cidrs'] is defined -%}