From 4e495dc2abb419fd043fddb0b5be302be7c94af5 Mon Sep 17 00:00:00 2001
From: Ilya Dmitrichenko <errordeveloper@gmail.com>
Date: Fri, 9 Feb 2018 13:42:40 +0000
Subject: [PATCH] Update Weave Net to version 2.2.0

---
 .../networking.weave/k8s-1.6.yaml.template    | 27 ++++++++-------
 .../networking.weave/k8s-1.7.yaml.template    | 34 ++++++++-----------
 .../pre-k8s-1.6.yaml.template                 |  6 ++--
 3 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template
index 35d6b50c4f..be307bb221 100644
--- a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml.template
@@ -1,7 +1,16 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: weave-net
+  namespace: kube-system
+  labels:
+    name: weave-net
+---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: weave-net
+  namespace: kube-system
   labels:
     name: weave-net
     role.kubernetes.io/networking: "1"
@@ -25,19 +34,11 @@ rules:
       - list
       - watch
 ---
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: weave-net
-  labels:
-    name: weave-net
-    role.kubernetes.io/networking: "1"
-  namespace: kube-system
----
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: weave-net
+  namespace: kube-system
   labels:
     name: weave-net
     role.kubernetes.io/networking: "1"
@@ -94,10 +95,10 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: weave-net
+  namespace: kube-system
   labels:
     name: weave-net
     role.kubernetes.io/networking: "1"
-  namespace: kube-system
 spec:
   template:
     metadata:
@@ -127,7 +128,7 @@ spec:
             - name: CONN_LIMIT
               value: "{{ .Networking.Weave.ConnLimit }}"
             {{- end }}
-          image: 'weaveworks/weave-kube:2.1.3'
+          image: 'weaveworks/weave-kube:2.2.0'
           livenessProbe:
             httpGet:
               host: 127.0.0.1
@@ -156,13 +157,15 @@ spec:
             - name: lib-modules
               mountPath: /lib/modules
         - name: weave-npc
+          args:
+            - '--use-legacy-netpol'
           env:
             - name: HOSTNAME
               valueFrom:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: 'weaveworks/weave-npc:2.1.3'
+          image: 'weaveworks/weave-npc:2.2.0'
           resources:
             requests:
               cpu: 50m
diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template
index 0dd92d4332..f3c9c1f971 100644
--- a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template
@@ -1,7 +1,16 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: weave-net
+  namespace: kube-system
+  labels:
+    name: weave-net
+---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: weave-net
+  namespace: kube-system
   labels:
     name: weave-net
     role.kubernetes.io/networking: "1"
@@ -16,14 +25,6 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - extensions
-    resources:
-      - networkpolicies
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - 'networking.k8s.io'
     resources:
@@ -33,19 +34,11 @@ rules:
       - list
       - watch
 ---
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: weave-net
-  labels:
-    name: weave-net
-    role.kubernetes.io/networking: "1"
-  namespace: kube-system
----
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: weave-net
+  namespace: kube-system
   labels:
     name: weave-net
     role.kubernetes.io/networking: "1"
@@ -102,10 +95,10 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: weave-net
+  namespace: kube-system
   labels:
     name: weave-net
     role.kubernetes.io/networking: "1"
-  namespace: kube-system
 spec:
   template:
     metadata:
@@ -135,7 +128,7 @@ spec:
             - name: CONN_LIMIT
               value: "{{ .Networking.Weave.ConnLimit }}"
             {{- end }}
-          image: 'weaveworks/weave-kube:2.1.3'
+          image: 'weaveworks/weave-kube:2.2.0'
           livenessProbe:
             httpGet:
               host: 127.0.0.1
@@ -166,13 +159,14 @@ spec:
             - name: xtables-lock
               mountPath: /run/xtables.lock
         - name: weave-npc
+          args: []
           env:
             - name: HOSTNAME
               valueFrom:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: 'weaveworks/weave-npc:2.1.3'
+          image: 'weaveworks/weave-npc:2.2.0'
           resources:
             requests:
               cpu: 50m
diff --git a/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template
index c42f58ece3..4e92b826f4 100644
--- a/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml.template
@@ -46,7 +46,7 @@ spec:
             - name: CONN_LIMIT
               value: "{{ .Networking.Weave.ConnLimit }}"
             {{- end }}
-          image: 'weaveworks/weave-kube:2.1.3'
+          image: 'weaveworks/weave-kube:2.2.0'
           livenessProbe:
             httpGet:
               host: 127.0.0.1
@@ -75,13 +75,15 @@ spec:
             - name: lib-modules
               mountPath: /lib/modules
         - name: weave-npc
+          args:
+            - '--use-legacy-netpol'
           env:
             - name: HOSTNAME
               valueFrom:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: 'weaveworks/weave-npc:2.1.3'
+          image: 'weaveworks/weave-npc:2.2.0'
           resources:
             requests:
               cpu: 50m