From f0c26052eb2d96bb6229127a9611615ad29de28b Mon Sep 17 00:00:00 2001
From: CJ Cullen <cjcullen@google.com>
Date: Wed, 6 May 2015 17:49:35 -0700
Subject: [PATCH] Fix controller-manager manifest for providers that don't
 specify CLUSTER_IP_RANGE

---
 .../kube-controller-manager/kube-controller-manager.manifest    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
index 1c41d06a1eb..a75185890c9 100644
--- 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 -%}