C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1411 from kevinjqiu/allow-calico-ipip-subnet-mode

Browse source 
Allow calico ipPool to be created with mode "cross-subnet"
This commit is contained in:
Spencer Smith 2017-07-06 14:04:03 -04:00 committed by GitHub
commit 3ab90db6ee
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/network_plugin/calico/defaults/main.yml
View file

@ -4,6 +4,7 @@ nat_outgoing: true
# Use IP-over-IP encapsulation across hosts # Use IP-over-IP encapsulation across hosts
ipip: false ipip: false
ipip_mode: always # change to "cross-subnet" if you only want ipip encapsulation on traffic going across subnets
# Set to true if you want your calico cni binaries to overwrite the # Set to true if you want your calico cni binaries to overwrite the
# ones from hyperkube while leaving other cni plugins intact. # ones from hyperkube while leaving other cni plugins intact.

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

@ -94,7 +94,7 @@
shell: > shell: >
echo '{ echo '{
"kind": "ipPool", "kind": "ipPool",
"spec": {"disabled": false, "ipip": {"enabled": {{ cloud_provider is defined or ipip }}}, "spec": {"disabled": false, "ipip": {"enabled": {{ cloud_provider is defined or ipip }}, "mode": "{{ ipip_mode }}"},
"nat-outgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }}}, "nat-outgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }}},
"apiVersion": "v1", "apiVersion": "v1",
"metadata": {"cidr": "{{ kube_pods_subnet }}"} "metadata": {"cidr": "{{ kube_pods_subnet }}"}