External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-04 02:01:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Optionally ignore the presence of extra calico pools (#2190)

Browse Source
This commit is contained in:
Matthew Mosesohn
2018-01-25 18:44:20 +03:00
committed by GitHub
parent c6e0fcea31
commit d2935ffed0
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/network_plugin/calico/tasks/main.yml
View File

@@ -142,7 +142,7 @@
fail:
msg: 'Only one network pool must be configured and it must be the subnet {{ kube_pods_subnet }}.
Please erase calico configuration and run the playbook again ("etcdctl rm --recursive /calico/v1/ipam/v4/pool")'
when: ( calico_pools['node']['nodes'] | length > 1 ) or
when: ( calico_pools['node']['nodes'] | length > 1 and not calico_ignore_extra_pools ) or
( not calico_pools['node']['nodes'][0]['key'] | search(".*{{ kube_pods_subnet | ipaddr('network') }}.*") )
run_once: true