From 5122697f0b348a8415d7d800e0ef2a85d3bb6ae7 Mon Sep 17 00:00:00 2001
From: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
Date: Mon, 6 Feb 2017 11:32:19 +0100
Subject: [PATCH] Improve Weave

- Remove weave CPU limits from .gitlab-ci.yml. Closes: #975
- Fix weave version in documentation

Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
---
 .gitlab-ci.yml                  | 2 --
 README.md                       | 2 +-
 roles/uploads/defaults/main.yml | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48ea239a1..9aec99788 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,8 +115,6 @@ before_script:
       -e kubelet_deployment_type=${KUBELET_DEPLOYMENT}
       -e local_release_dir=${PWD}/downloads
       -e resolvconf_mode=${RESOLVCONF_MODE}
-      -e weave_cpu_requests=${WEAVE_CPU_LIMIT}
-      -e weave_cpu_limit=${WEAVE_CPU_LIMIT}
       cluster.yml
 
 
diff --git a/README.md b/README.md
index 83afc75a8..3f2fa1549 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ Versions of supported components
 [flanneld](https://github.com/coreos/flannel/releases) v0.6.2 <br>
 [calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.23.0 <br>
 [canal](https://github.com/projectcalico/canal) (given calico/flannel versions) <br>
-[weave](http://weave.works/) v1.6.1 <br>
+[weave](http://weave.works/) v1.8.2 <br>
 [docker](https://www.docker.com/) v1.12.5 <br>
 [rkt](https://coreos.com/rkt/docs/latest/) v1.21.0 <br>
 
diff --git a/roles/uploads/defaults/main.yml b/roles/uploads/defaults/main.yml
index 8ad7b6021..af9572532 100644
--- a/roles/uploads/defaults/main.yml
+++ b/roles/uploads/defaults/main.yml
@@ -5,7 +5,7 @@ local_release_dir: /tmp
 etcd_version: v3.0.6
 calico_version: v0.23.0
 calico_cni_version: v1.4.2
-weave_version: v1.6.1
+weave_version: v1.8.2
 
 # Download URL's
 etcd_download_url: "https://github.com/coreos/etcd/releases/download/{{ etcd_version }}/etcd-{{ etcd_version }}-linux-amd64.tar.gz"
@@ -16,7 +16,7 @@ weave_download_url: "https://github.com/weaveworks/weave/releases/download/{{wea
 # Checksums
 calico_cni_checksum: "9cab29764681e9d80da826e4b2cd10841cc01a749e0018867d96dd76a4691548"
 calico_cni_ipam_checksum: "09d076b15b791956efee91646e47fdfdcf382db16082cef4f542a9fff7bae172"
-weave_checksum: "9bf9d6e5a839e7bcbb28cc00c7acae9d09284faa3e7a3720ca9c2b9e93c68580"
+weave_checksum: "ee22e690985115a5986352b2c75589674349c618a5c95893f87600a13e2d58e9"
 etcd_checksum: "385afd518f93e3005510b7aaa04d38ee4a39f06f5152cd33bb86d4f0c94c7485"
 
 downloads: