Merge pull request #1305 from zouyee/master
upgrade k8s version to 1.6.4
This commit is contained in:
commit
fdb36d1878
4 changed files with 5 additions and 4 deletions
|
@ -50,7 +50,8 @@ Note: Upstart/SysV init based OS types are not supported.
|
||||||
Versions of supported components
|
Versions of supported components
|
||||||
--------------------------------
|
--------------------------------
|
||||||
|
|
||||||
[kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.6.1 <br>
|
|
||||||
|
[kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.6.4 <br>
|
||||||
[etcd](https://github.com/coreos/etcd/releases) v3.0.17 <br>
|
[etcd](https://github.com/coreos/etcd/releases) v3.0.17 <br>
|
||||||
[flanneld](https://github.com/coreos/flannel/releases) v0.6.2 <br>
|
[flanneld](https://github.com/coreos/flannel/releases) v0.6.2 <br>
|
||||||
[calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.23.0 <br>
|
[calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.23.0 <br>
|
||||||
|
|
|
@ -23,7 +23,7 @@ kube_users_dir: "{{ kube_config_dir }}/users"
|
||||||
kube_api_anonymous_auth: false
|
kube_api_anonymous_auth: false
|
||||||
|
|
||||||
## Change this to use another Kubernetes version, e.g. a current beta release
|
## Change this to use another Kubernetes version, e.g. a current beta release
|
||||||
kube_version: v1.6.1
|
kube_version: v1.6.4
|
||||||
|
|
||||||
# Where the binaries will be downloaded.
|
# Where the binaries will be downloaded.
|
||||||
# Note: ensure that you've enough disk space (about 1G)
|
# Note: ensure that you've enough disk space (about 1G)
|
||||||
|
|
|
@ -18,7 +18,7 @@ download_localhost: False
|
||||||
download_always_pull: False
|
download_always_pull: False
|
||||||
|
|
||||||
# Versions
|
# Versions
|
||||||
kube_version: v1.6.1
|
kube_version: v1.6.4
|
||||||
etcd_version: v3.0.17
|
etcd_version: v3.0.17
|
||||||
#TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
|
#TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
|
||||||
# after migration to container download
|
# after migration to container download
|
||||||
|
|
|
@ -4,7 +4,7 @@ bootstrap_os: none
|
||||||
kube_api_anonymous_auth: false
|
kube_api_anonymous_auth: false
|
||||||
|
|
||||||
## Change this to use another Kubernetes version, e.g. a current beta release
|
## Change this to use another Kubernetes version, e.g. a current beta release
|
||||||
kube_version: v1.6.1
|
kube_version: v1.6.4
|
||||||
|
|
||||||
# Directory where the binaries will be installed
|
# Directory where the binaries will be installed
|
||||||
bin_dir: /usr/local/bin
|
bin_dir: /usr/local/bin
|
||||||
|
|
Loading…
Reference in a new issue