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

Merge pull request #2362 from mattymo/calico_ignore_extra_pools_again

Browse Source 
Use CNI to assign kube_pods_subnet for calico
This commit is contained in:
Brad Beam
2018-02-28 12:36:50 -06:00
committed by GitHub
parent a40d9f3c72 87f33a4644
commit afb6e7dfc3
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,14 +135,6 @@
calico_pools: "{{ calico_pools_raw.stdout | from_json }}"
run_once: true
- name: Calico | Check if calico pool is properly configured
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 and not calico_ignore_extra_pools ) or
( not calico_pools['node']['nodes'][0]['key'] | search(".*{{ kube_pods_subnet | ipaddr('network') }}.*") )
run_once: true
- name: Calico | Set global as_num
command: "{{ bin_dir}}/calicoctl config set asNumber {{ global_as_num }}"
run_once: true