Merge pull request #545 from kubespray/upgrade_calico_v0.22.0
upgrade calico version v0.22.0pull/549/head
commit
f74d6b084b
|
@ -43,8 +43,8 @@ Versions
|
|||
|
||||
[kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.4.0 <br>
|
||||
[etcd](https://github.com/coreos/etcd/releases) v3.0.1 <br>
|
||||
[calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.20.0 <br>
|
||||
[flanneld](https://github.com/coreos/flannel/releases) v0.6.2 <br>
|
||||
[calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.22.0 <br>
|
||||
[weave](http://weave.works/) v1.6.1 <br>
|
||||
[docker](https://www.docker.com/) v1.10.3 <br>
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ kube_version: v1.4.0
|
|||
etcd_version: v3.0.6
|
||||
#TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
|
||||
# after migration to container download
|
||||
calico_version: v0.20.0
|
||||
calico_version: v0.22.0
|
||||
calico_cni_version: v1.4.2
|
||||
weave_version: v1.6.1
|
||||
flannel_version: v0.6.2
|
||||
|
|
|
@ -5,7 +5,7 @@ local_release_dir: /tmp
|
|||
kube_version: v1.4.0
|
||||
|
||||
etcd_version: v3.0.6
|
||||
calico_version: v0.20.0
|
||||
calico_version: v0.22.0
|
||||
calico_cni_version: v1.4.2
|
||||
weave_version: v1.6.1
|
||||
|
||||
|
|
Loading…
Reference in New Issue