Merge pull request #1365 from AtzeDeVries/master

Give more control over IPIP, but with same default behaviour

inventory/group_vars/k8s-cluster.yml

@@ -71,6 +71,7 @@ kube_users:
 # Can also be set to 'cloud', which lets the cloud provider setup appropriate routing
 kube_network_plugin: calico
 
+
 # Enable kubernetes network policies
 enable_network_policy: false
 

roles/network_plugin/calico/defaults/main.yml

@@ -3,7 +3,7 @@
 nat_outgoing: true
 
 # Use IP-over-IP encapsulation across hosts
-ipip: false
+ipip: true
 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

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 }}, "mode": "{{ ipip_mode }}"},
+    "spec": {"disabled": false, "ipip": {"enabled": {{ ipip }}, "mode": "{{ ipip_mode }}"},
              "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
-         cloud_provider is defined or ipip)
+  when: (legacy_calicoctl and ipip )
   tags: facts
 
 - name: Calico (old) | Define nat-outgoing pool argument