From 5e558c361bddac0b06688c810371dda736408300 Mon Sep 17 00:00:00 2001
From: Aivars Sterns <Atoms@users.noreply.github.com>
Date: Mon, 13 Nov 2017 18:11:47 +0200
Subject: [PATCH] update weave-net to 2.0.5 version (#1877)

---
 roles/download/defaults/main.yml                      |  2 +-
 roles/network_plugin/weave/templates/weave-net.yml.j2 | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index d74157e45..02fa542c6 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -34,9 +34,9 @@ calico_ctl_version: "v1.5.0"
 calico_cni_version: "v1.10.0"
 calico_policy_version: "v0.7.0"
 calico_rr_version: "v0.4.0"
-weave_version: 2.0.4
 flannel_version: "v0.9.0"
 flannel_cni_version: "v0.3.0"
+weave_version: 2.0.5
 pod_infra_version: 3.0
 
 # Download URLs
diff --git a/roles/network_plugin/weave/templates/weave-net.yml.j2 b/roles/network_plugin/weave/templates/weave-net.yml.j2
index 67c04d9be..2f8703f94 100644
--- a/roles/network_plugin/weave/templates/weave-net.yml.j2
+++ b/roles/network_plugin/weave/templates/weave-net.yml.j2
@@ -9,7 +9,7 @@ items:
       labels:
         name: weave-net
       namespace: {{ system_namespace }}
-  - apiVersion: rbac.authorization.k8s.io/v1beta1
+  - apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRole
     metadata:
       name: weave-net
@@ -34,7 +34,7 @@ items:
           - get
           - list
           - watch
-  - apiVersion: rbac.authorization.k8s.io/v1beta1
+  - apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRoleBinding
     metadata:
       name: weave-net
@@ -114,6 +114,9 @@ items:
                   mountPath: /host/var/lib/dbus
                 - name: lib-modules
                   mountPath: /lib/modules
+                - name: xtables-lock
+                  mountPath: /run/xtables.lock
+                  readOnly: false
             - name: weave-npc
               image: {{ weave_npc_image_repo }}:{{ weave_npc_image_tag }}
               imagePullPolicy: Always
@@ -154,6 +157,9 @@ items:
             - name: lib-modules
               hostPath:
                 path: /lib/modules
+            - name: xtables-lock
+              hostPath:
+                path: /run/xtables.lock
       updateStrategy:
         rollingUpdate:
           maxUnavailable: {{ serial | default('20%') }}