Merge pull request #604 from kubernetes-incubator/k8s-upgrade-v1.4.6

upgrade k8s version to 1.4.6
This commit is contained in:
Matthew Mosesohn 2016-11-15 12:27:29 +03:00 committed by GitHub
commit 3a8d9cb0bc
3 changed files with 4 additions and 4 deletions

View file

@ -41,8 +41,8 @@ Supported Linux distributions
Versions Versions
-------------- --------------
[kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.4.3 <br> [kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.4.6 <br>
[etcd](https://github.com/coreos/etcd/releases) v3.0.1 <br> [etcd](https://github.com/coreos/etcd/releases) v3.0.6 <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.22.0 <br> [calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.22.0 <br>
[weave](http://weave.works/) v1.6.1 <br> [weave](http://weave.works/) v1.6.1 <br>

View file

@ -5,7 +5,7 @@ local_release_dir: /tmp
download_run_once: False download_run_once: False
# Versions # Versions
kube_version: v1.4.3 kube_version: v1.4.6
etcd_version: v3.0.6 etcd_version: v3.0.6
#TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults #TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults

View file

@ -2,7 +2,7 @@
local_release_dir: /tmp local_release_dir: /tmp
# Versions # Versions
kube_version: v1.4.3 kube_version: v1.4.6
etcd_version: v3.0.6 etcd_version: v3.0.6
calico_version: v0.23.0 calico_version: v0.23.0