From 8d0817e38795d28946fc083f8ee388da1b0f9143 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Steenis <mail@superseb.nl>
Date: Wed, 17 Jan 2018 16:08:28 +0100
Subject: [PATCH] Default DefaultNetworkCloudProvider is none

---
 templates/calico.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/calico.go b/templates/calico.go
index 840a3adc..57ea497a 100644
--- a/templates/calico.go
+++ b/templates/calico.go
@@ -469,7 +469,7 @@ metadata:
   namespace: kube-system
 
 
-{{if ne .CloudProvider ""}}
+{{if ne .CloudProvider "none"}}
 ---
 kind: ConfigMap
 apiVersion: v1
@@ -477,7 +477,7 @@ metadata:
   name: {{.CloudProvider}}-ippool
   namespace: kube-system
 data:
-  aws-ippool: |-
+  {{.CloudProvider}}-ippool: |-
     apiVersion: v1
     kind: ipPool
     metadata: