Merge "Disable ipip tunnelling for calico by default"

This commit is contained in:
Jenkins 2016-09-21 14:00:34 +00:00 committed by Gerrit Code Review
commit 54d64106c7
1 changed files with 1 additions and 1 deletions

View File

@ -5,7 +5,7 @@ kube_proxy_mode: "iptables"
kube_apiserver_insecure_port: "8080"
#Configure calico to set --nat-outgoing and --ipip pool option
ipip: true
ipip: false
#Set kubernetes version. Note that v3.0.1 has bugs
kube_version: "v1.3.5"
#Override hyperkube image to use CoreOS v1.3.5