Skip to content
Snippets Groups Projects
Commit 61b74f9a authored by AtzeDeVries's avatar AtzeDeVries
Browse files

updated to direct control over ipip

parent 73326796
No related branches found
No related tags found
No related merge requests found
......@@ -71,10 +71,6 @@ kube_users:
# Can also be set to 'cloud', which lets the cloud provider setup appropriate routing
kube_network_plugin: calico
# In case of calico, override default behaviour to enable IPIP. Default behaviour is in case
# of a cloud_provider ipip:true and in case of no cloud provider ipip:false
# calico_ipip: true
# Enable kubernetes network policies
enable_network_policy: false
......
......@@ -2,9 +2,8 @@
# Enables Internet connectivity from containers
nat_outgoing: true
# !! NOT USED in favour over calico_ipip
# Use IP-over-IP encapsulation across hosts
# ipip: false
ipip: true
# Set to true if you want your calico cni binaries to overwrite the
# ones from hyperkube while leaving other cni plugins intact.
......
......@@ -94,7 +94,7 @@
shell: >
echo '{
"kind": "ipPool",
"spec": {"disabled": false, "ipip": {"enabled": {{ calico_ipip is defined | ternary(calico_ipip, cloud_provider is defined) }}},
"spec": {"disabled": false, "ipip": {"enabled": {{ ipip }}},
"nat-outgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }}},
"apiVersion": "v1",
"metadata": {"cidr": "{{ kube_pods_subnet }}"}
......@@ -110,8 +110,7 @@
run_once: true
set_fact:
ipip_arg: "--ipip"
when: (legacy_calicoctl and
calico_ipip is defined | ternary (calico_ipip, cloud_provider is defined))
when: (legacy_calicoctl and ipip )
tags: facts
- name: Calico (old) | Define nat-outgoing pool argument
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment