Merge "update etcd to 3.0.10"

This commit is contained in:
Jenkins 2016-09-29 09:48:14 +00:00 committed by Gerrit Code Review
commit 22cf2804ba
1 changed files with 7 additions and 6 deletions

View File

@ -6,16 +6,17 @@ kube_apiserver_insecure_port: "8080"
#Configure calico to set --nat-outgoing and --ipip pool option
ipip: false
#Set kubernetes version. Note that v3.0.1 has bugs
#Set kubernetes version.
kube_version: "v1.3.5"
#Override hyperkube image to use CoreOS v1.3.5
#Overridden component versions (different from Kargo upstream)
#use CoreOS hyperkube v1.3.5
hyperkube_image_repo: "quay.io/coreos/hyperkube"
hyperkube_image_tag: "v1.3.5_coreos.0"
#Required for hyperkube >=1.3.4. Set to false if installing old hyperkube
use_hyperkube_cni: true
etcd_version: "v3.0.10"
# Versions from kargo commit 4fb4ac120b9433109924b17701e822dde0d39fbf
etcd_version: "v3.0.1"
# Versions from kargo commit 948d1d61ff8f5e0c315577012497d7551d0b480c
calico_version: "v0.20.0"
calico_cni_version: "v1.3.1"