Fixed conflicts, ipip:true as defualt and added ipip_mode

This commit is contained in:
AtzeDeVries
2017-07-08 14:36:44 +02:00
74 changed files with 466 additions and 357 deletions

View File

@@ -4,6 +4,7 @@ nat_outgoing: true
# Use IP-over-IP encapsulation across hosts
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
# ones from hyperkube while leaving other cni plugins intact.