From dd022f2dbc5d26062af62f560f99c19404835dc6 Mon Sep 17 00:00:00 2001
From: Smana <smainklh@gmail.com>
Date: Wed, 12 Oct 2016 22:18:43 +0200
Subject: [PATCH] upgrade calico version v0.22.0

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

diff --git a/README.md b/README.md
index fa51d189b..d3ed06b4a 100644
--- a/README.md
+++ b/README.md
@@ -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>
 
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 1ef7b45df..3feef7554 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -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
diff --git a/roles/uploads/defaults/main.yml b/roles/uploads/defaults/main.yml
index 661dd053a..fb07e4c2e 100644
--- a/roles/uploads/defaults/main.yml
+++ b/roles/uploads/defaults/main.yml
@@ -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