From a742d10c54116538f50b35a2379ef8efcad3c3fb Mon Sep 17 00:00:00 2001
From: Kevin Jing Qiu <kevin@idempotent.ca>
Date: Tue, 4 Jul 2017 19:05:16 -0400
Subject: [PATCH] Allow calico ipPool to be created with mode "cross-subnet"
---
roles/network_plugin/calico/defaults/main.yml | 1 +
roles/network_plugin/calico/tasks/main.yml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index 3ef70413f..8cd120234 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -4,6 +4,7 @@ nat_outgoing: true
# Use IP-over-IP encapsulation across hosts
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
# ones from hyperkube while leaving other cni plugins intact.
diff --git a/roles/network_plugin/calico/tasks/main.yml b/roles/network_plugin/calico/tasks/main.yml
index fa734464e..cdd17ffa6 100644
--- a/roles/network_plugin/calico/tasks/main.yml
+++ b/roles/network_plugin/calico/tasks/main.yml
@@ -94,7 +94,7 @@
shell: >
echo '{
"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) }}},
"apiVersion": "v1",
"metadata": {"cidr": "{{ kube_pods_subnet }}"}
--
GitLab