x
/
fuel-ccp-installer
Code Issues Proposed changes

Merge "Bump k8s to 1.3.5"

This commit is contained in:
Jenkins 2016-08-17 13:37:52 +00:00 committed by Gerrit Code Review
parent 1056af9d23 25fa495287
commit 3b89a3762c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/kargo/kargo_default_common.yaml
View File

@ -5,10 +5,12 @@ kube_proxy_mode: "iptables"
#Configure calico to set --nat-outgoing and --ipip pool option
ipip: true
#Set kubernetes version. Note that v3.0.1 has bugs
kube_version: "v1.2.6"
#Override hyperkube image to use CoreOS v1.2.6
kube_version: "v1.3.5"
#Override hyperkube image to use CoreOS v1.3.5
hyperkube_image_repo: "quay.io/coreos/hyperkube"
hyperkube_image_tag: "v1.2.6_coreos.0"
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
# Versions from kargo commit 4fb4ac120b9433109924b17701e822dde0d39fbf
etcd_version: "v3.0.1"