Merge "Disable ipip tunnelling for calico by default"
This commit is contained in:
commit
54d64106c7
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue