updated to direct control over ipip

inventory/group_vars/k8s-cluster.yml

@@ -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

roles/network_plugin/calico/defaults/main.yml

@@ -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.

roles/network_plugin/calico/tasks/main.yml

@@ -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
+  when: (legacy_calicoctl and ipip )
-         calico_ipip is defined | ternary (calico_ipip, cloud_provider is defined))
   tags: facts
 
 - name: Calico (old) | Define nat-outgoing pool argument