From 6c30a7b2eb0a9a474d04122b8e134f0f1c479131 Mon Sep 17 00:00:00 2001
From: Eric Hoffmann <2ffs2nns@gmail.com>
Date: Mon, 28 Aug 2017 13:23:29 -0700
Subject: [PATCH] update calico version update calico releases link

---
 README.md                        | 2 +-
 roles/download/defaults/main.yml | 4 ++--
 roles/uploads/defaults/main.yml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 08f853f54..641f783d7 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Versions of supported components
 [kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.7.3 <br>
 [etcd](https://github.com/coreos/etcd/releases) v3.2.4 <br>
 [flanneld](https://github.com/coreos/flannel/releases) v0.8.0 <br>
-[calicoctl](https://github.com/projectcalico/calico-docker/releases) v1.1.3 <br>
+[calico](https://docs.projectcalico.org/v2.5/releases/) v2.5.0 <br>
 [canal](https://github.com/projectcalico/canal) (given calico/flannel versions) <br>
 [weave](http://weave.works/) v2.0.1 <br>
 [docker](https://www.docker.com/) v1.13 (see note)<br>
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 21599d986..25a335915 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -22,8 +22,8 @@ kube_version: v1.7.3
 etcd_version: v3.2.4
 # TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
 # after migration to container download
-calico_version: "v2.4.1"
-calico_ctl_version: "v1.4.0"
+calico_version: "v2.5.0"
+calico_ctl_version: "v1.5.0"
 calico_cni_version: "v1.10.0"
 calico_policy_version: "v0.7.0"
 weave_version: 2.0.1
diff --git a/roles/uploads/defaults/main.yml b/roles/uploads/defaults/main.yml
index bc0a17f32..587c0f043 100644
--- a/roles/uploads/defaults/main.yml
+++ b/roles/uploads/defaults/main.yml
@@ -3,7 +3,7 @@ local_release_dir: /tmp
 
 # Versions
 etcd_version: v3.0.17
-calico_version: v2.4.1
+calico_version: v2.5.0
 calico_cni_version: v1.10.0
 weave_version: v2.0.1