Optionally ignore the presence of extra calico pools (#2190)
This commit is contained in:
parent
c6e0fcea31
commit
d2935ffed0
2 changed files with 4 additions and 1 deletions
|
@ -16,6 +16,9 @@ etcd_cert_dir: /etc/ssl/etcd/ssl
|
|||
# Global as_num (/calico/bgp/v1/global/as_num)
|
||||
global_as_num: "64512"
|
||||
|
||||
# Set to true if you need to configure multiple pools (this is not common)
|
||||
calico_ignore_extra_pools: false
|
||||
|
||||
# You can set MTU value here. If left undefined or empty, it will
|
||||
# not be specified in calico CNI config, so Calico will use built-in
|
||||
# defaults. The value should be a number, not a string.
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue