Skip to content
Snippets Groups Projects
Commit a742d10c authored by Kevin Jing Qiu's avatar Kevin Jing Qiu
Browse files

Allow calico ipPool to be created with mode "cross-subnet"

parent 6e7323e3
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,7 @@ nat_outgoing: true ...@@ -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.
......
...@@ -94,7 +94,7 @@ ...@@ -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 }}"}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment