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

Give more control over IPIP, but with same default behaviour

Browse Source
This commit is contained in:
AtzeDeVries
2017-06-20 14:50:08 +02:00
parent 586d2a41ce
commit 7332679678
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/network_plugin/calico/tasks/main.yml
View File

@@ -94,7 +94,7 @@
shell: >
echo '{
"kind": "ipPool",
"spec": {"disabled": false, "ipip": {"enabled": {{ cloud_provider is defined or ipip }}},
"spec": {"disabled": false, "ipip": {"enabled": {{ calico_ipip is defined | ternary(calico_ipip, cloud_provider is defined) }}},
"nat-outgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }}},
"apiVersion": "v1",
"metadata": {"cidr": "{{ kube_pods_subnet }}"}
@@ -111,7 +111,7 @@
set_fact:
ipip_arg: "--ipip"
when: (legacy_calicoctl and
cloud_provider is defined or ipip)
calico_ipip is defined | ternary (calico_ipip, cloud_provider is defined))
tags: facts
- name: Calico (old) | Define nat-outgoing pool argument