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

add calico VXLAN mode, update docs and vars in sample inventory (#5731)

Browse Source 
* calico VXLAN mode

* check vars if calico backend defined
This commit is contained in:
Sergey
2020-03-12 11:20:37 +03:00
committed by GitHub
parent 2c8bcc6722
commit e60b9f796e
6 changed files with 81 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/network_plugin/calico/tasks/install.yml
View File

@@ -140,7 +140,8 @@
},
"spec": {
"cidr": "{{ calico_pool_cidr | default(kube_pods_subnet) }}",
"ipipMode": "{{ ipip_mode }}",
"ipipMode": "{{ calico_ipip_mode }}",
"vxlanMode": "{{ calico_vxlan_mode }}",
"natOutgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }} }} " | {{ bin_dir }}/calicoctl.sh apply -f -
when:
- inventory_hostname == groups['kube-master'][0]
@@ -158,7 +159,8 @@
"spec": {
"blockSize": "{{ calico_pool_blocksize | default(kube_network_node_prefix) }}",
"cidr": "{{ calico_pool_cidr | default(kube_pods_subnet) }}",
"ipipMode": "{{ ipip_mode }}",
"ipipMode": "{{ calico_ipip_mode }}",
"vxlanMode": "{{ calico_vxlan_mode }}",
"natOutgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }} }} " | {{ bin_dir }}/calicoctl.sh apply -f -
when:
- inventory_hostname == groups['kube-master'][0]