epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-09 19:58:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Calico: Ability to define the default IPPool CIDR (instead of kube_pods_subnet) (#4131)

Browse Source 
* Calico: Ability to define the default IPPool CIDR (instead of kube_pods_subnet)

* Documentation for calico_pool_cidr (and calico_advertise_cluster_ips which has been forgotten...)
This commit is contained in:
Erwan Miran
2019-01-31 22:39:13 +01:00
committed by Kubernetes Prow Robot
parent 40f1c51ec3
commit f6d60a7e89
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/network_plugin/calico/templates/cni-calico.conflist.j2
View File

@@ -17,7 +17,7 @@
"ipam": {
"type": "calico-ipam",
"assign_ipv4": "true",
"ipv4_pools": ["{{ kube_pods_subnet }}"]
"ipv4_pools": ["{{ calico_pool_cidr | default(kube_pods_subnet) }}"]
},
{% if enable_network_policy %}
"policy": {