rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-10-22 03:32:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request #242 from superseb/calico_cloudprovider_fixes

Browse Source 
Default DefaultNetworkCloudProvider is none
This commit is contained in:
Alena Prokharchyk
2018-01-17 10:00:05 -08:00
committed by GitHub
parent d76f51c75b 8d0817e387
commit ff2d36c610
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/calico.go
View File

@@ -469,7 +469,7 @@ metadata:
namespace: kube-system namespace: kube-system
{{if ne .CloudProvider ""}} {{if ne .CloudProvider "none"}}
--- ---
kind: ConfigMap kind: ConfigMap
apiVersion: v1 apiVersion: v1
@@ -477,7 +477,7 @@ metadata:
name: {{.CloudProvider}}-ippool name: {{.CloudProvider}}-ippool
namespace: kube-system namespace: kube-system
data: data:
aws-ippool: |- {{.CloudProvider}}-ippool: |-
apiVersion: v1 apiVersion: v1
kind: ipPool kind: ipPool
metadata: metadata: