From 8afce340c4b29fcbb2035d9230900a62ffd79669 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Fri, 10 Feb 2017 18:06:31 +0300
Subject: [PATCH] Update calico to v1.0.2

Also calico-cni to v1.5.6, calico-policy to v0.5.2

Fixes: #1011
---
 roles/download/defaults/main.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 6fc594a49..ea95048f6 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -21,8 +21,9 @@ download_always_pull: False
 etcd_version: v3.0.6
 #TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
 # after migration to container download
-calico_version: "v1.0.0"
-calico_cni_version: "v1.5.5"
+calico_version: "v1.0.2"
+calico_cni_version: "v1.5.6"
+calico_policy_version: "v0.5.2"
 weave_version: 1.8.2
 flannel_version: v0.6.2
 pod_infra_version: 3.0
@@ -47,7 +48,7 @@ calico_node_image_tag: "{{ calico_version }}"
 calico_cni_image_repo: "calico/cni"
 calico_cni_image_tag: "{{ calico_cni_version }}"
 calico_policy_image_repo: "calico/kube-policy-controller"
-calico_policy_image_tag: "v0.5.1"
+calico_policy_image_tag: "{{ calico_policy_version }}"
 # TODO(adidenko): switch to "calico/routereflector" when
 # https://github.com/projectcalico/calico-bird/pull/27 is merged
 calico_rr_image_repo: "quay.io/l23network/routereflector"