Fixed conflicts, ipip:true as defualt and added ipip_mode

roles/kubespray-defaults/tasks/main.yaml

roles/network_plugin/calico/defaults/main.yml

roles/network_plugin/calico/tasks/main.yml

roles/reset/tasks/main.yml

roles/upgrade/post-upgrade/tasks/main.yml

roles/upgrade/pre-upgrade/tasks/main.yml

roles/vault/tasks/bootstrap/ca_trust.yml

roles/vault/tasks/shared/issue_cert.yml

roles/vault/tasks/shared/sync.yml

roles/vault/tasks/shared/sync_file.yml

scale.yml

tests/cloud_playbooks/create-gce.yml

upgrade-cluster.yml